diff --git a/ChangeLog b/ChangeLog
index f1ccbf7ff6..c4c4a5ad4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan 18 18:07:23 EST 1998 Adrian Likins <adrian@gimp.org>
+
+        * added plugins/gflare/gflares and edited the makefiles
+	  so that the gfalres and gfig-examples would get installed
+	  into share/gimp/gflares and share/gimp/gfig 
+
+
 Tue Jan 13 21:36:07 PST 1998 Manish Singh <yosh@gimp.org>
 
 	* ltconfig
diff --git a/configure.in b/configure.in
index 626a7066c9..c30bfcc5ef 100644
--- a/configure.in
+++ b/configure.in
@@ -331,6 +331,7 @@ plug-ins/AlienMap/Makefile
 plug-ins/c_astretch/Makefile
 plug-ins/bumpmap/Makefile
 plug-ins/gflare/Makefile
+plug-ins/gflare/gflares/Makefile
 plug-ins/script-fu/Makefile
 plug-ins/script-fu/scripts/Makefile
 plug-ins/jpeg/Makefile
@@ -353,6 +354,7 @@ plug-ins/libgck/Makefile
 plug-ins/libgck/gck/Makefile
 plug-ins/blur/Makefile
 plug-ins/gfig/Makefile
+plug-ins/gfig/gfig-examples/Makefile
 plug-ins/flame/Makefile
 plug-ins/gimptcl/Makefile
 plug-ins/gimptcl/scripts/Makefile
diff --git a/etc/gimprc.in b/etc/gimprc.in
index 75bf273178..95353a732b 100644
--- a/etc/gimprc.in
+++ b/etc/gimprc.in
@@ -198,7 +198,7 @@
 (transparency-size 2)
 
 # gfig pattern directory
-(gfig-path "${gimp_dir}/gfig")
+(gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
 
 # path for gflare flares directory
 (gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares")
\ No newline at end of file
diff --git a/gimprc.in b/gimprc.in
index 75bf273178..95353a732b 100644
--- a/gimprc.in
+++ b/gimprc.in
@@ -198,7 +198,7 @@
 (transparency-size 2)
 
 # gfig pattern directory
-(gfig-path "${gimp_dir}/gfig")
+(gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
 
 # path for gflare flares directory
 (gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares")
\ No newline at end of file
diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am
index 2f5690827c..44b8374d8d 100644
--- a/plug-ins/gfig/Makefile.am
+++ b/plug-ins/gfig/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = gfig-examples
+
 pluginlibdir = $(gimpplugindir)/plug-ins
 
 pluginlib_PROGRAMS = gfig
diff --git a/plug-ins/gfig/gfig-examples/.cvsignore b/plug-ins/gfig/gfig-examples/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/plug-ins/gfig/gfig-examples/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/plug-ins/gfig/gfig-examples/A star b/plug-ins/gfig/gfig-examples/A_star
similarity index 100%
rename from plug-ins/gfig/gfig-examples/A star
rename to plug-ins/gfig/gfig-examples/A_star
diff --git a/plug-ins/gfig/gfig-examples/spirals & stars b/plug-ins/gfig/gfig-examples/spirals_and_stars
similarity index 100%
rename from plug-ins/gfig/gfig-examples/spirals & stars
rename to plug-ins/gfig/gfig-examples/spirals_and_stars
diff --git a/plug-ins/gflare/Makefile.am b/plug-ins/gflare/Makefile.am
index 963e3fc5e2..4185dff186 100644
--- a/plug-ins/gflare/Makefile.am
+++ b/plug-ins/gflare/Makefile.am
@@ -2,6 +2,8 @@
 
 pluginlibdir = $(gimpplugindir)/plug-ins
 
+SUBDIRS = gflares
+
 EXTRA_DIST = README
 
 pluginlib_PROGRAMS = gflare
diff --git a/plug-ins/gflare/gflares/.cvsignore b/plug-ins/gflare/gflares/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/plug-ins/gflare/gflares/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in