diff --git a/ChangeLog b/ChangeLog
index 7984a179b..546af6b48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 27 21:00:45 1999 Gregory McLean <gregm@comstar.net>
+
+	* applied a patch from Duncan Mak <mustapha@wegythu.res.cmu.edu>
+	to get the mc spec file to work.
+	* hacked configure to generate a properly versioned spec file.
+
 Fri Feb 26 22:06:51 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* gtkedit/editcmd.c (menu_save_mode_cmd): translate strings for
diff --git a/configure.in b/configure.in
index 0e97afbad..64444ec30 100644
--- a/configure.in
+++ b/configure.in
@@ -1233,6 +1233,7 @@ dnl
 AC_OUTPUT([
 Make.common 
 Makefile 
+mc.spec
 VERSION
 doc/Makefile 
 vfs/Makefile:vfs/Make-mc.in
diff --git a/mc.spec b/mc.spec.in
similarity index 95%
rename from mc.spec
rename to mc.spec.in
index 15fdd21be..333d2f3d9 100644
--- a/mc.spec
+++ b/mc.spec.in
@@ -1,6 +1,7 @@
 # Note that this is NOT a relocatable package
-%define ver      4.5.16
-%define prefix   /usr
+%define ver     @VERSION@
+%define rel     1
+%define prefix  /usr
 
 Summary:   Midnight Commander visual shell
 Name:      mc
@@ -46,7 +47,8 @@ Midnight file system (currently, only the Midnight Commander file manager).
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--prefix=%{prefix} \
 	--with-gnome \
-	--without-debug
+	--without-debug \
+        --sysconfdir=/etc
 
 if [ "$SMP" != "" ]; then
   (make "MAKE=make -k -j $SMP"; exit 0)
@@ -56,9 +58,12 @@ else
 fi
 
 %install
+echo $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,profile.d,X11/wmconfig}
 
+mkdir -p $RPM_BUILD_ROOT/etc/CORBA/servers
+
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 (cd icons; make prefix=$RPM_BUILD_ROOT%{prefix} install_icons)
 install lib/mcserv.init $RPM_BUILD_ROOT/etc/rc.d/init.d/mcserv
@@ -66,6 +71,10 @@ install lib/mcserv.init $RPM_BUILD_ROOT/etc/rc.d/init.d/mcserv
 install lib/mcserv.pamd $RPM_BUILD_ROOT/etc/pam.d/mcserv
 install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/profile.d
 
+#musta's kludge
+install gnome/gmc.gnorba $RPM_BUILD_ROOT/etc/CORBA/servers/gmc.gnorba
+
+
 # clean up this setuid problem for now
 chmod 755 $RPM_BUILD_ROOT/usr/lib/mc/bin/cons.saver
 
@@ -113,10 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/mc/mc-gnome.ext
 %{prefix}/share/pixmaps/mc/*
 %{prefix}/share/mime-info/mc.keys
-%dir %{prefix}/etc
-%dir %{prefix}/etc/CORBA
-%dir %{prefix}/etc/CORBA/servers
-%config %{prefix}/etc/CORBA/servers/*
+%config %{prefix}/../etc/CORBA/servers/gmc.gnorba
 
 %changelog
 * Thu Aug 20 1998 Michael Fulbright <msf@redhat.com>