diff --git a/Makefile.am b/Makefile.am
index 13774837a1..0ec9ada69a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ bin_SCRIPTS = gtk-config
 
 EXTRA_DIST =	\
 	HACKING		\
-	gtk+.spec	\
+	gtk+.spec.in	\
         gtk.m4          \
 	makecopyright	\
 	TODO		\
@@ -97,6 +97,8 @@ EXTRA_DIST =	\
 	examples/spinbutton/Makefile  \
 	examples/find-examples.sh
 
+dist-hook:
+	cp gtk+.spec $(distdir)
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gtk.m4
diff --git a/configure.in b/configure.in
index 4e79211c51..3e01a4681b 100644
--- a/configure.in
+++ b/configure.in
@@ -510,6 +510,7 @@ AC_SUBST(GTK_XIM_FLAGS)
 AC_SUBST(GTK_LOCALE_FLAGS)
 
 AC_OUTPUT([
+gtk+.spec
 Makefile
 gtk-config
 po/Makefile.in
diff --git a/gtk+.spec b/gtk+.spec.in
similarity index 93%
rename from gtk+.spec
rename to gtk+.spec.in
index 638ebcfc2f..dc228691fe 100644
--- a/gtk+.spec
+++ b/gtk+.spec.in
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      1.1.16
+%define ver      @VERSION@
 %define rel      SNAP
 %define prefix   /usr
 
@@ -10,7 +10,7 @@ Release: %rel
 Copyright: LGPL
 Group: X11/Libraries
 Source: ftp://ftp.gimp.org/pub/gtk/v1.1/gtk+-%{ver}.tar.gz
-BuildRoot: /tmp/gtk-root
+BuildRoot: /var/tmp/gtk-%{PACKAGE_VERSION}-root
 Obsoletes: gtk
 Packager: Christopher Blizzard <blizzard@redhat.com>
 URL: http://www.gtk.org
@@ -37,6 +37,8 @@ Xlib to help automate things like dealing with different color depths,
 and GTK is a widget set for creating user interfaces.
 
 %changelog
+* Sun Feb 21 1999 Michael Fulbright <drmike@redhat.com>
+- updated spec file
 
 * Sun Oct 25 1998 Shawn T. Amundson <amundson@gtk.org>
 
@@ -148,6 +150,9 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{prefix}/lib/libgtk-1.1.so.*
 %{prefix}/lib/libgdk-1.1.so.*
+{prefix}/share/themes/Default
++%{prefix}/share/locale/*/*/*
+ 
 
 %files devel
 %defattr(-, root, root)
@@ -156,5 +161,6 @@ fi
 %{prefix}/lib/*a
 %{prefix}/include/*
 %{prefix}/info/*
+%{prefix}/man/man1/*
 %{prefix}/share/aclocal/*
 %{prefix}/bin/*