diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes
index f9fcb42..a68ad7c 100644
--- a/cyrus-sasl-saslauthd.changes
+++ b/cyrus-sasl-saslauthd.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Jun  7 06:15:02 UTC 2010 - coolo@novell.com
-
-- add dependency to avoid broken parallel make
-
 -------------------------------------------------------------------
 Mon May 10 12:53:14 UTC 2010 - rhafer@novell.com
 
diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec
index 2dd92e7..1d78f28 100644
--- a/cyrus-sasl-saslauthd.spec
+++ b/cyrus-sasl-saslauthd.spec
@@ -27,7 +27,7 @@ AutoReqProv:    on
 Provides:       cyrus-sasl:/usr/sbin/saslauthd
 Provides:       cyrus-sasl2:/usr/sbin/saslauthd
 Summary:        The SASL Authentication Server
-Version: 2.1.23
+Version:        2.1.23
 Release:        6
 Source:         cyrus-sasl-%{version}.tar.bz2
 Source1:        cyrus-sasl-rc.tar.bz2
diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes
index f9fcb42..a68ad7c 100644
--- a/cyrus-sasl.changes
+++ b/cyrus-sasl.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Jun  7 06:15:02 UTC 2010 - coolo@novell.com
-
-- add dependency to avoid broken parallel make
-
 -------------------------------------------------------------------
 Mon May 10 12:53:14 UTC 2010 - rhafer@novell.com
 
diff --git a/cyrus-sasl.dif b/cyrus-sasl.dif
index 5d5a70a..fc0224f 100644
--- a/cyrus-sasl.dif
+++ b/cyrus-sasl.dif
@@ -1,7 +1,7 @@
 Index: cmulocal/cyrus.m4
 ===================================================================
---- cmulocal/cyrus.m4.orig	2009-04-28 17:09:13.000000000 +0200
-+++ cmulocal/cyrus.m4	2010-06-07 15:27:08.000000000 +0200
+--- cmulocal/cyrus.m4.orig
++++ cmulocal/cyrus.m4
 @@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
      SAVE_LDFLAGS="${LDFLAGS}"
      LDFLAGS="-R /usr/lib"
@@ -13,8 +13,8 @@ Index: cmulocal/cyrus.m4
      ])
 Index: Makefile.am
 ===================================================================
---- Makefile.am.orig	2006-05-19 16:45:21.000000000 +0200
-+++ Makefile.am	2010-06-07 15:27:08.000000000 +0200
+--- Makefile.am.orig
++++ Makefile.am
 @@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
  #
  ################################################################
@@ -25,8 +25,8 @@ Index: Makefile.am
  else
 Index: configure.in
 ===================================================================
---- configure.in.orig	2009-04-28 17:18:04.000000000 +0200
-+++ configure.in	2010-06-07 15:27:08.000000000 +0200
+--- configure.in.orig
++++ configure.in
 @@ -52,6 +52,7 @@ AC_CACHE_LOAD
  fi
  
@@ -37,8 +37,8 @@ Index: configure.in
  
 Index: plugins/Makefile.am
 ===================================================================
---- plugins/Makefile.am.orig	2009-04-28 17:09:17.000000000 +0200
-+++ plugins/Makefile.am	2010-06-07 15:27:08.000000000 +0200
+--- plugins/Makefile.am.orig
++++ plugins/Makefile.am
 @@ -46,23 +46,10 @@
  
  # Library version info - here at the top, for sanity
@@ -143,8 +143,8 @@ Index: plugins/Makefile.am
  
 Index: sasldb/Makefile.am
 ===================================================================
---- sasldb/Makefile.am.orig	2009-04-28 17:09:18.000000000 +0200
-+++ sasldb/Makefile.am	2010-06-07 15:28:37.000000000 +0200
+--- sasldb/Makefile.am.orig
++++ sasldb/Makefile.am
 @@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
  
  extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
@@ -153,12 +153,3 @@ Index: sasldb/Makefile.am
  EXTRA_DIST = NTMakefile
  
  noinst_LTLIBRARIES = libsasldb.la
-@@ -66,3 +67,8 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
- 	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
- 
- 
-+# avoid these two files created at the same time, they use both the same
-+# dep file
-+db_berkeley.lo: db_berkeley.o
-+allockey.lo: allockey.o
-+