diff --git a/.cvsignore b/.cvsignore
index e127362..063f671 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-emelfm2-0.2.tar.gz
+emelfm2-0.3.1.tar.gz
diff --git a/emelfm2-makefile.config.patch b/emelfm2-makefile.config.patch
index 1d956e0..560cf9b 100644
--- a/emelfm2-makefile.config.patch
+++ b/emelfm2-makefile.config.patch
@@ -1,25 +1,20 @@
---- Makefile.config.orig	2006-06-17 16:45:01.000000000 +0200
-+++ Makefile.config	2006-08-06 23:55:05.000000000 +0200
-@@ -2,11 +2,11 @@
- ### installation (where) ###
- ############################
- 
--PREFIX ?= /usr/local
-+PREFIX ?= %PREFIX%
- BIN_DIR ?= $(PREFIX)/bin
- 
+--- Makefile.config.orig	2006-11-25 02:06:37.000000000 +0100
++++ Makefile.config	2006-11-11 22:30:33.000000000 +0100
+@@ -12,7 +12,7 @@
+ ### documentation ###
+ #####################
  # setting this to 1 makes the default docs dir include the current version no.
 -DOCS_VERSION ?= 0
 +DOCS_VERSION ?= 1
  
- #defaults for PLUGINS_DIR, DOC_DIR, ICON_DIR, LOCALE_DIR are set in Makefile
+ #the name of the default main-user-guide document
+ HELPDOC ?= USAGE
+@@ -87,7 +87,7 @@
  
-@@ -63,7 +63,7 @@
- 
- # setting this to 1 includes code (not much) that is applicable
- # only to Gtk versions > 2.4
+ # setting this to 1 includes code (not much) that is applicable only
+ # to Gtk versions > 2.6, if the build-system has any such Gtk
 -USE_LATEST ?= 0
 +USE_LATEST ?= 1
  
- #########################
- ### documentation ###
+ # setting DEBUG to 0/1 turns debugging off/on
+ DEBUG ?= 0
diff --git a/emelfm2.spec b/emelfm2.spec
index 21eb0bd..2d9a200 100644
--- a/emelfm2.spec
+++ b/emelfm2.spec
@@ -1,16 +1,17 @@
 Name:           emelfm2
-Version:        0.2.0
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
 URL:            http://emelfm2.net/
-Source0:        http://emelfm2.net/rel/emelfm2-0.2.tar.gz
-Patch0:		emelfm2-makefile.config.patch
+Source0:        http://emelfm2.net/rel/emelfm2-0.3.1.tar.gz
+Patch0:         emelfm2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0, gettext, desktop-file-utils
+#BuildRequires:  gamin-devel
 Requires:       findutils >= 4.2, file, grep, sed
 
 %description
@@ -20,16 +21,23 @@ file typing scheme, and a built-in command line for executing commands without
 opening an xterm.
 
 %prep
-%setup -qn emelfm2-0.2
+%setup -q
 %patch0 -p0 -b .orig
-sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
+
 # fix for x86_64 libs
 sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
+
 # fix broken icon in emelfm2.desktop
 sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
-make %{?_smp_mflags}
+#echo $RPM_OPT_FLAGS
+#export CFLAGS="${RPM_OPT_FLAGS}"
+#echo $CFLAGS
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS}" \
+    PREFIX="%{_prefix}" 
 
 
 %install
@@ -41,10 +49,9 @@ make install_i18n PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-	--add-category Application                            	\
-	--add-category Utility                                	\
-	--delete-original                                       \
+        --add-category Application                              \
+        --add-category Utility                                  \
+        --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %clean
@@ -53,11 +60,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING 
+%doc docs/ACTIONS docs/CONFIGURATION docs/CREDITS docs/HACKING 
 %doc docs/README docs/TODO docs/USAGE docs/WARNING 
 %doc docs/help.txt docs/GPL docs/LGPL
 %{_bindir}/%{name}
-%{_libdir}/%{name}
+%{_libdir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/pixmaps/%{name}
@@ -65,8 +72,15 @@ rm -rf $RPM_BUILD_ROOT
 
 	
 %changelog
+* Sat Dec 16 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-1
+- Update 0.3.1.
+- Remove Category "X-Fedora" from emelfm2.desktop.
+
+* Mon Aug 28 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+- Update 0.3.
+
 * Mon Aug 28 2006 Christoph Wickert <fedora christoph-wickert de> - 0.2.0-1
-- Update 0.2.0
+- Update 0.2.0.
 
 * Fri Aug 11 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.8-2
 - Include upstream's e2-0.1.8-06-08-09.patch to fix two serious bugs.
@@ -91,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update to 0.1.4.
 
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-2
-- Removed nonexistant ROADMAP from %doc.
+- Removed nonexistant ROADMAP from %%doc.
 
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-1
 - Update to 0.1.3.
diff --git a/sources b/sources
index 42f19af..d13e8fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-506f6a12779c23e589a55c778b648798  emelfm2-0.2.tar.gz
+c246141755a3c89137f307ce56c3c456  emelfm2-0.3.1.tar.gz