diff --git a/dev-lang/python/patches/python-3.2a3.patch b/dev-lang/python/patches/python-3.2a3.patch
index 01e47d41d..e5e38d18f 100644
--- a/dev-lang/python/patches/python-3.2a3.patch
+++ b/dev-lang/python/patches/python-3.2a3.patch
@@ -5,6 +5,66 @@ diff -urN Python-3.2a3/Lib/plat-haiku/regen Python-3.2a3-haiku/Lib/plat-haiku/re
 +#! /bin/sh
 +set -v
 +python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /boot/develop/headers/posix/netinet/in.h
+diff -urN Python-3.2a3/Modules/resource.c Python-3.2a3-haiku/Modules/resource.c
+--- Python-3.2a3/Modules/resource.c	2010-05-09 08:52:27.038797312 -0700
++++ Python-3.2a3-haiku/Modules/resource.c	2010-10-26 09:40:31.530055168 -0700
+@@ -86,6 +86,7 @@
+                     PyFloat_FromDouble(doubletime(ru.ru_utime)));
+     PyStructSequence_SET_ITEM(result, 1,
+                     PyFloat_FromDouble(doubletime(ru.ru_stime)));
++#ifndef __HAIKU__
+     PyStructSequence_SET_ITEM(result, 2, PyLong_FromLong(ru.ru_maxrss));
+     PyStructSequence_SET_ITEM(result, 3, PyLong_FromLong(ru.ru_ixrss));
+     PyStructSequence_SET_ITEM(result, 4, PyLong_FromLong(ru.ru_idrss));
+@@ -100,7 +101,7 @@
+     PyStructSequence_SET_ITEM(result, 13, PyLong_FromLong(ru.ru_nsignals));
+     PyStructSequence_SET_ITEM(result, 14, PyLong_FromLong(ru.ru_nvcsw));
+     PyStructSequence_SET_ITEM(result, 15, PyLong_FromLong(ru.ru_nivcsw));
+-
++#endif
+     if (PyErr_Occurred()) {
+         Py_DECREF(result);
+         return NULL;
+diff -urN Python-3.2a3/Modules/socketmodule.c Python-3.2a3-haiku/Modules/socketmodule.c
+--- Python-3.2a3/Modules/socketmodule.c	2010-09-28 15:03:27.048234496 -0700
++++ Python-3.2a3-haiku/Modules/socketmodule.c	2010-10-26 09:42:24.675545088 -0700
+@@ -4595,7 +4595,9 @@
+     PyModule_AddIntConstant(m, "SOCK_DGRAM", SOCK_DGRAM);
+ /* We have incomplete socket support. */
+     PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
++#ifndef __HAIKU__
+     PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET);
++#endif
+ #if defined(SOCK_RDM)
+     PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
+ #endif
+diff -urN Python-3.2a3/Modules/socketmodule.h Python-3.2a3-haiku/Modules/socketmodule.h
+--- Python-3.2a3/Modules/socketmodule.h	2010-08-28 13:42:55.046399488 -0700
++++ Python-3.2a3-haiku/Modules/socketmodule.h	2010-10-26 09:36:23.904658944 -0700
+@@ -47,6 +47,10 @@
+ #  undef AF_NETLINK
+ #endif
+ 
++#if defined (__HAIKU__)
++#  undef HAVE_BLUETOOTH_BLUETOOTH_H
++#endif
++
+ #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
+diff -urN Python-3.2a3/Modules/spwdmodule.c Python-3.2a3-haiku/Modules/spwdmodule.c
+--- Python-3.2a3/Modules/spwdmodule.c	2010-05-15 09:27:27.038535168 -0700
++++ Python-3.2a3-haiku/Modules/spwdmodule.c	2010-10-26 09:41:38.998506496 -0700
+@@ -80,7 +80,9 @@
+ 
+     SETS(setIndex++, p->sp_namp);
+     SETS(setIndex++, p->sp_pwdp);
++#ifndef __HAIKU__
+     SETI(setIndex++, p->sp_lstchg);
++#endif
+     SETI(setIndex++, p->sp_min);
+     SETI(setIndex++, p->sp_max);
+     SETI(setIndex++, p->sp_warn);
 diff -urN Python-3.2a3/Python/bltinmodule.c Python-3.2a3-haiku/Python/bltinmodule.c
 --- Python-3.2a3/Python/bltinmodule.c	2010-09-27 14:08:38.054788096 -0700
 +++ Python-3.2a3-haiku/Python/bltinmodule.c	2010-10-25 13:10:52.010747904 -0700
diff --git a/packs/libpak/libpak-0.9.3.bep b/packs/libpak/libpak-0.9.3.bep
index 443c7c9c9..34378d9db 100644
--- a/packs/libpak/libpak-0.9.3.bep
+++ b/packs/libpak/libpak-0.9.3.bep
@@ -22,7 +22,7 @@ BUILD {
 	mv ${HPLOC}/dev-util/pkgconfig/*.zip .
 ##
 	setgcc gcc2
-	haikuporter -y -d -i readline-6.0
+	haikuporter -y -d -i readline-6.1
 	mv ${HPLOC}/sys-libs/readline/*.zip .
 	haikuporter -y -d -i lua-5.1.4
 	mv ${HPLOC}/dev-lang/lua/*.zip .
diff --git a/packs/optionalpackages/optionalpackages-0.5.bep b/packs/optionalpackages/optionalpackages-0.5.bep
index 53e491771..dca30b895 100644
--- a/packs/optionalpackages/optionalpackages-0.5.bep
+++ b/packs/optionalpackages/optionalpackages-0.5.bep
@@ -22,7 +22,7 @@ BUILD {
 	setgcc gcc2
 	
 ##  Group 1	
-#	haikuporter -i readline-6.0
+	haikuporter -i readline-6.1
 	haikuporter -i libedit-20100424
 	haikuporter -y -d -i autoconf-2.68
 	mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips
@@ -100,6 +100,8 @@ BUILD {
 	mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips	
 	haikuporter -y -d -i clockwerk-78
 	mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips		
+	haikuporter -z -y clockwerk-78
+	mv ${HPLOC}/haiku-apps/clockwerk/*.xz ${HPLOC}/packs/optionalpackages/sources			
 	haikuporter -y -d -i cmake-2.8.2
 	mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips		
 	haikuporter -y -d -i curl-7.21.2
@@ -234,7 +236,7 @@ BUILD {
 		
 #3	haikuporter -y -d -i KeymapSwitcher-1.2.5
 	haikuporter -y -d -i clockwerk-78
-	mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips		
+	mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips	
 #3	haikuporter -y -d -i clucene-0.9.21
 #3	haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre
 	haikuporter -y -d -i xz-utils-4.999.9
diff --git a/sys-libs/readline/patches/readline-6.1.patch b/sys-libs/readline/patches/readline-6.1.patch
new file mode 100644
index 000000000..f5d75f829
--- /dev/null
+++ b/sys-libs/readline/patches/readline-6.1.patch
@@ -0,0 +1,27 @@
+diff -urN readline-6.1/configure.in readline-6.1-haiku/configure.in
+--- readline-6.1/configure.in	2009-10-12 07:12:15.054788096 -0700
++++ readline-6.1-haiku/configure.in	2010-10-26 10:21:29.204210176 -0700
+@@ -85,6 +85,9 @@
+     i[[3456]]86-*-beos*)
+         cross_cache=${srcdir}/cross-build/x86-beos.cache
+         ;;
++    i[[3456]]86-*-haiku*)
++        cross_cache=${srcdir}/cross-build/x86-haiku.cache
++        ;;        
+     *)  echo "configure: cross-compiling for $host is not supported" >&2
+         ;;
+     esac
+diff -urN readline-6.1/rltty.c readline-6.1-haiku/rltty.c
+--- readline-6.1/rltty.c	2009-11-19 06:42:02.059768832 -0800
++++ readline-6.1-haiku/rltty.c	2010-10-26 10:25:50.489160704 -0700
+@@ -238,7 +238,10 @@
+      TIOTYPE oldtio, *tiop;
+ {
+   _rl_echoing_p = (oldtio.sgttyb.sg_flags & ECHO);
++
++#if defined (ECHOCTL)
+   _rl_echoctl = (oldtio.sgttyb.sg_flags & ECHOCTL);
++#endif
+ 
+   /* Copy the original settings to the structure we're going to use for
+      our settings. */
diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep
index b56ce26c9..807a3a1bf 100644
--- a/sys-libs/readline/readline-6.0.bep
+++ b/sys-libs/readline/readline-6.0.bep
@@ -1,6 +1,6 @@
 DESCRIPTION="readline" 
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" 
-SRC_URI="ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.0.tar.gz"
 CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019"
 REVISION="1"
 STATUS_HAIKU="stable"
diff --git a/sys-libs/readline/readline-6.1.bep b/sys-libs/readline/readline-6.1.bep
new file mode 100644
index 000000000..9392c2d6f
--- /dev/null
+++ b/sys-libs/readline/readline-6.1.bep
@@ -0,0 +1,30 @@
+DESCRIPTION="readline" 
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" 
+SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz"
+CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd readline-6.1
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	if [ -n "$(setgcc | grep '2')" ]; then 
+		LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
+	else
+		LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4
+	fi
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--libdir=$LIBDIR \
+		--mandir=$MANDIR
+	make
+}
+
+INSTALL {
+	cd readline-6.1
+	make install DESTDIR="${DESTDIR}"
+}
+LICENSE="GNU GPL v3"
+COPYRIGHT="1989-2010 Free Software Foundation, Inc."