diff --git a/openldap-2.4.23-no-build-dates.patch b/openldap-2.4.23-no-build-dates.patch
new file mode 100644
index 0000000..5041bcd
--- /dev/null
+++ b/openldap-2.4.23-no-build-dates.patch
@@ -0,0 +1,20 @@
+--- build/mkversion.orig
++++ build/mkversion
+@@ -50,7 +50,7 @@ if test $# != 1 ; then
+ fi
+ 
+ APPLICATION=$1
+-WHOWHERE="$USER@`uname -n`:`pwd`"
++WHOWHERE="opensuse-buildservice@opensuse.org"
+ 
+ cat << __EOF__
+ /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+@@ -72,7 +72,7 @@ static const char copyright[] =
+ "COPYING RESTRICTIONS APPLY\n";
+ 
+ $static $const char $SYMBOL[] =
+-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n"
++"@(#) \$$PACKAGE: $APPLICATION $VERSION \$\n"
+ "\t$WHOWHERE\n";
+ 
+ __EOF__
diff --git a/openldap2-client.changes b/openldap2-client.changes
index f16839f..2782ee0 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct  3 22:55:34 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Do not include Build date and time in binaries, this
+  avoids build-compare failures and unhelpful rebuilds/republishes 
+
 -------------------------------------------------------------------
 Wed Sep 29 09:21:52 UTC 2010 - rhafer@novell.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index c6c0b73..f8a9e36 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2-client (Version 2.4.23)
+# spec file for package openldap2 (Version 2.4.23)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 %define run_test_suite 1
 
-Name:           openldap2-client
+Name:         openldap2-client
 BuildRequires:  cyrus-sasl-devel libopenssl-devel
 %if %sles_version == 9 || %sles_version == 10
 BuildRequires:  -libopenssl-devel -pwdutils openssl-devel
@@ -61,6 +61,7 @@ Patch5:         0005-pie-compile.dif
 Patch6:         0006-assorted-fixes-for-back-config-DELETE-support.dif
 Patch100:       openldap-2.3.37.dif
 Patch200:       slapd_getaddrinfo_dupl.dif
+Patch201:		openldap-2.4.23-no-build-dates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "openldap2"
 
@@ -195,10 +196,12 @@ Authors:
 %patch6 -p1
 %if %suse_version == 1100
 %patch200 -p1
+%patch201
 %endif
 cp %{SOURCE5} .
 cd ../openldap-2.3.37
 %patch100
+%patch201
 
 %build
 %{?suse_update_config:%{suse_update_config -f build}}
diff --git a/openldap2.changes b/openldap2.changes
index f16839f..2782ee0 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct  3 22:55:34 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Do not include Build date and time in binaries, this
+  avoids build-compare failures and unhelpful rebuilds/republishes 
+
 -------------------------------------------------------------------
 Wed Sep 29 09:21:52 UTC 2010 - rhafer@novell.com
 
diff --git a/openldap2.spec b/openldap2.spec
index 5de3ad8..9f656ae 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -61,6 +61,7 @@ Patch5:         0005-pie-compile.dif
 Patch6:         0006-assorted-fixes-for-back-config-DELETE-support.dif
 Patch100:       openldap-2.3.37.dif
 Patch200:       slapd_getaddrinfo_dupl.dif
+Patch201:		openldap-2.4.23-no-build-dates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if "%{name}" == "openldap2"
 
@@ -195,10 +196,12 @@ Authors:
 %patch6 -p1
 %if %suse_version == 1100
 %patch200 -p1
+%patch201
 %endif
 cp %{SOURCE5} .
 cd ../openldap-2.3.37
 %patch100
+%patch201
 
 %build
 %{?suse_update_config:%{suse_update_config -f build}}