diff --git a/CHANGES b/CHANGES
index ef2f47f74..c50c240df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@
 	- added Obsoletes: tag, an upgrade removes packages which
 	  have been obsoleted
 	- updated rpmdepUpgradePackage() to deal with obsoletes tag
+	- moved popt into a separate library
 
 2.4.6 -> 2.4.7:
 	- had some wrong month lengths in changelog date parsing
diff --git a/Makefile.in b/Makefile.in
index 30c38127c..cb85874ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,13 +30,13 @@ ETCDIR=$(ROOT)/etc
 
 # -----------------------------------------------------------------------
 
-SUBDIRS = misc lib build tools @PO@
+SUBDIRS = popt misc lib build tools @PO@
 INSTSUBDIRS = lib @PO@
 OTHERSUBDIRS = docs autodeps
 OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o @GETTEXTSTUB@
 PROGS = @RPM@ rpm2cpio
 LIBS = @LIBS@ @LIBINTL@ @LIBDL@
-LOADLIBES = -lbuild $(topdir)/lib/librpm.a -lmisc 
+LOADLIBES = -lbuild popt/libpopt.a $(topdir)/lib/librpm.a -lmisc 
 
 SOURCES = $(subst .o,.c,$(OBJS))
 
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 63b76ddb3..0c66bf876 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -3,7 +3,7 @@ VPATH = $(srcdir)
 
 include $(srcdir)/../Makefile.inc
 
-LIBOBJECTS = @MISCOBJS@ popt.o
+LIBOBJECTS = @MISCOBJS@ 
 LIBMISC = libmisc.a
 
 # -----------------------------------------------------------------------
diff --git a/rpm.c b/rpm.c
index ab67a4255..0ca5167c0 100755
--- a/rpm.c
+++ b/rpm.c
@@ -23,7 +23,7 @@
 #include "intl.h"
 #include "lib/messages.h"
 #include "lib/signature.h"
-#include "misc/popt.h"
+#include "popt/popt.h"
 #include "miscfn.h"
 #include "query.h"
 #include "rpmlib.h"