diff --git a/CHANGES b/CHANGES
index f27cfdd5a..fcf683c50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -125,6 +125,7 @@
 	- support for rpmlib(...) internal feature dependencies.
 	- display rpmlib provides when invoked with --showrc.
 	- fix: compare versions if doing --freshen.
+	- disable rpmlib(VersionedDependencies) by defining _noVersionedDependencies.
 
 3.0.3 -> 3.0.4
 	- use compressed filenames on install side.
diff --git a/build/parseReqs.c b/build/parseReqs.c
index 394ba091f..3a77c266a 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -148,7 +148,8 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag,
 	    case RPMTAG_PROVIDEFLAGS:
 	    case RPMTAG_OBSOLETEFLAGS:
 		/* Add prereq on rpmlib that has versioned dependencies. */
-		rpmlibNeedsFeature(h, "VersionedDependencies", "3.0.3-1");
+		if (!rpmExpandNumeric("%{_noVersionedDependencies}"))
+		    rpmlibNeedsFeature(h, "VersionedDependencies", "3.0.3-1");
 		break;
 	    default:
 		break;
diff --git a/configure.in b/configure.in
index 10a5793a5..4d2a43049 100644
--- a/configure.in
+++ b/configure.in
@@ -365,8 +365,7 @@ done
 dnl zlib-1.0.4 has not gzseek
 AC_CHECK_LIB(${zlib}, gzseek, [AC_DEFINE(HAVE_GZSEEK)])
 
-AC_CHECK_LIB(bz2, bzread, 
-  [LIBS="$LIBS -lbz2"; break], 
+AC_CHECK_LIB(bz2, bzread, [LIBS="$LIBS -lbz2"], 
    AC_CHECK_LIB(bz2, BZ2_bzread, [
      LIBS="$LIBS -lbz2"
      AC_DEFINE(HAVE_BZ2_1_0) ], 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ba84e661f..302332750 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -224,6 +224,19 @@ update-po: Makefile
 	  fi; \
 	done
 
+refresh-po: Makefile
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`echo $$cat | sed 's/.mo//'`; \
+		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pot ; then \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+			mv -f $$lang.pot $$lang.po ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			rm -f $$lang.pot ; \
+		fi \
+	done
+
 POTFILES: POTFILES.in
 	( if test 'x$(srcdir)' != 'x.'; then \
 	    posrcprefix='$(top_srcdir)/'; \
diff --git a/po/rpm.pot b/po/rpm.pot
index 968c07eee..90961d25a 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-07 15:28-0400\n"
+"POT-Creation-Date: 2000-08-14 09:19-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1607,57 +1607,57 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1231
+#: build/files.c:1230
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1238 build/pack.c:100
+#: build/files.c:1239 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1565
+#: build/files.c:1566
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1577 build/parsePrep.c:34
+#: build/files.c:1578 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1632
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1637
+#: build/files.c:1638
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1719
+#: build/files.c:1720
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1723
+#: build/files.c:1724
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1819
+#: build/files.c:1820
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1847 build/files.c:1857
+#: build/files.c:1848 build/files.c:1858
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1967
+#: build/files.c:1968
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2036,7 +2036,7 @@ msgstr ""
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:169
+#: build/parseReqs.c:170
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""