diff --git a/fvwm-no-date-time.patch b/fvwm-no-date-time.patch
new file mode 100644
index 0000000..8db6089
--- /dev/null
+++ b/fvwm-no-date-time.patch
@@ -0,0 +1,24 @@
+--- fvwm/session.c.orig
++++ fvwm/session.c
+@@ -135,7 +135,7 @@ static char *get_version_string(void)
+ {
+ 	/* migo (14-Mar-2001): it is better to manually update a version string
+ 	 * in the stable branch, otherwise saving sessions becomes useless */
+-	return CatString3(VERSION, ", ", __DATE__);
++	return CatString3(VERSION, ", ", "??? ?? ????");
+ 	/* return "2.6-0"; */
+ }
+ 
+--- fvwm/fvwm.c.orig
++++ fvwm/fvwm.c
+@@ -1298,8 +1298,8 @@ static void setVersionInfo(void)
+ 	int support_len;
+ 
+ 	/* Set version information string */
+-	sprintf(version_str, "fvwm %s%s compiled on %s at %s",
+-		VERSION, VERSIONINFO, __DATE__, __TIME__);
++	sprintf(version_str, "fvwm %s%s",
++		VERSION, VERSIONINFO);
+ 	Fvwm_VersionInfo = safestrdup(version_str);
+ 
+ 	sprintf(license_str,
diff --git a/fvwm2.changes b/fvwm2.changes
index 5f78e2d..bcbfe9d 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct  8 13:43:30 UTC 2014 - tchvatal@suse.com
+
+- Rename config file to not have underscore at begining
+
+-------------------------------------------------------------------
+Tue Sep 30 20:11:27 UTC 2014 - crrodriguez@opensuse.org
+
+- fvwm-no-date-time.patch Do not include __DATE__ and __TIME__ 
+  in binaries.
+- Drop usage of xorg-x11-devel. pick only the needed packages.
+
 -------------------------------------------------------------------
 Wed Jul 24 10:33:41 UTC 2013 - werner@suse.de
 
diff --git a/fvwm2.spec b/fvwm2.spec
index 07c0cc1..f8aba1b 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fvwm2
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,29 @@
 
 Name:           fvwm2
 BuildRequires:  automake
-BuildRequires:  freetype2-devel
-BuildRequires:  fribidi-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
-BuildRequires:  librsvg-devel
 BuildRequires:  libstroke-devel
 BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xpm)
+BuildRequires:  pkgconfig(xrender)
+#not actually used but includes its headers anyway..
+BuildRequires:  pkgconfig(xt)
 Provides:       fvwm
 Provides:       fvwmicns
 Provides:       windowmanager
@@ -45,7 +57,7 @@ Source0:        fvwm-%{version}.tar.bz2
 Source1:        fvwm_icons.tar.bz2
 Source3:        %name.desktop
 Source4:        system.fvwm2rc
-Source5:        _system.fvwm2rc
+Source5:        system.fvwm2rc_
 Source6:        openSuSE.xpm
 #SOURCE-FIX-OPENSUSE for snapshot 2012/10/11
 Source7:        fvwm-menu-desktop-config.fpl
@@ -64,6 +76,7 @@ Patch7:         fvwm-2.5.26-no-copy-dt-needed-entries.patch
 Patch8:         fvwm-rsvg.patch
 #PATCH-FIX-UPSTREAM Avoid crash due freeing inot set icon names
 Patch9:         fvwm-2.6.5-eventcrash.patch
+Patch10:        fvwm-no-date-time.patch
 #PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11
 Patch42:        fvwm-snapshot.patch
 
@@ -94,6 +107,7 @@ compatible with the Motif MWM.
 %patch8
 %endif
 %patch9
+%patch10
 find . -name *sv_SE* |xargs rename sv_SE sv  
 mkdir icons
 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
diff --git a/_system.fvwm2rc b/system.fvwm2rc_
similarity index 100%
rename from _system.fvwm2rc
rename to system.fvwm2rc_