diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 33e23d07a..7a468bed4 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -150,6 +150,7 @@
   * psmisc-21.4
   * pulsar-4.0.19
   * pwlib-Mimas_patch2
+  * pwlib-Mimas_patch2-src-tar
   * rp-pppoe-3.5
   * rrdtool-1.0.49
   * samba-3.0.22
diff --git a/lfs/Config b/lfs/Config
index 940883e2d..46cae092b 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -22,7 +22,7 @@ URL_TUE     = ftp://ftp.win.tue.nl/pub
 URL_LFS_FTP = http://ftp.at.linuxfromscratch.org/pub/lfs/lfs-packages/5.1.1
 URL_LFS     = http://www.linuxfromscratch.org/patches/downloads
 URL_SFNET   = http://switch.dl.sourceforge.net/sourceforge
-URL_IPFIRE  = http://mirror.ipfire.org/source-packages
+URL_IPFIRE  = http://mirror.ipfire.org/source
 URL_IPCOP   = http://ipcop.ath.cx
 
 # Default compiler optimizations.
diff --git a/lfs/pwlib b/lfs/pwlib
index 836ebebf3..cc1df0011 100644
--- a/lfs/pwlib
+++ b/lfs/pwlib
@@ -27,11 +27,11 @@
 
 include Config
 
-VER        = Mimas_patch2-src-tar
+VER        = ipfire1
 
 THISAPP    = pwlib-$(VER)
-DL_FILE    = $(THISAPP).gz
-DL_FROM    = $(URL_SFNET)/openh323
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/pwlib
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 90edee9d894558f98f840c1972205218
+$(DL_FILE)_MD5 = 2e2eecdc3ba54bdc973892ef9eea45c8
 
 install : $(TARGET)
 
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(DL_FILE)
 	ln -sf -v $(DIR_SRC)/pwlib* $(DIR_APP)
 #	mv -f $(DIR_SRC)/pwlib* $(DIR_SRC)/pwlib
 #	mv -f /usr/include/ldap.h /