diff --git a/sanlock.changes b/sanlock.changes
index 2082db1..f6cdf7f 100644
--- a/sanlock.changes
+++ b/sanlock.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 20 15:37:56 MST 2012 - jfehlig@suse.com
+
+- Don't use __DATE__ and __TIME__ macros when printing version
+- Don't add user 'sanlock' for now
+
 -------------------------------------------------------------------
 Thu Jan 19 18:04:13 MST 2012 - jfehlig@suse.com
 
diff --git a/sanlock.spec b/sanlock.spec
index 50197bf..c88b0ae 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -29,7 +29,7 @@ Summary:        A shared disk lock manager
 Group:          System/Base
 License:        GPLv2, GPLv2+, LGPLv2+
 URL:            https://fedorahosted.org/sanlock/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libblkid-devel libaio-devel python python-devel
 %if %{with_systemd}
 BuildRequires:  systemd
@@ -44,6 +44,7 @@ Patch0:         sanlock-SCHED_RESET_ON_FORK-undefined.patch
 Patch1:         sanlock-python-prefix.patch
 Patch2:         sanlock-old_blkid.patch
 Patch3:         suse-systemd.patch
+Patch4:         suse-no-date-time.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -58,6 +59,7 @@ access to the shared disks.
 %patch1
 %patch2
 %patch3 -p1
+%patch4 -p1
 
 %build
 # upstream does not require configure
@@ -90,8 +92,6 @@ install -D -m 755 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/useradd -u 179 -g 179 -c "sanlock" -s /sbin/nologin -r \
-                  -d /var/run/sanlock sanlock 2> /dev/null || :
 %if %{with_systemd}
 %service_add_pre wdmd.service
 %service_add_pre sanlock.service
diff --git a/suse-no-date-time.patch b/suse-no-date-time.patch
new file mode 100644
index 0000000..28f627a
--- /dev/null
+++ b/suse-no-date-time.patch
@@ -0,0 +1,14 @@
+Index: sanlock-1.9/src/main.c
+===================================================================
+--- sanlock-1.9.orig/src/main.c
++++ sanlock-1.9/src/main.c
+@@ -1430,8 +1430,7 @@ static int read_command_line(int argc, c
+ 
+ 	if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") ||
+ 	    !strcmp(arg1, "-V")) {
+-		printf("%s %s (built %s %s)\n",
+-		       argv[0], RELEASE_VERSION, __DATE__, __TIME__);
++		printf("%s %s\n", argv[0], RELEASE_VERSION);
+ 		exit(EXIT_SUCCESS);
+ 	}
+