diff --git a/teamplayer/Makefile b/teamplayer/Makefile
index 9b14e3d..393a4db 100644
--- a/teamplayer/Makefile
+++ b/teamplayer/Makefile
@@ -2,7 +2,7 @@ TP_REPO ?= ../../teamplayer
 TP_USER = teamplayer
 TP_HOME = /opt/teamplayer
 TP_DB = /var/lib/teamplayer
-PGVER = 9.2
+PGVER = 9.3
 INSTALL = install
 AVAHI := NO
 
@@ -41,9 +41,9 @@ endif
 	mkdir -p $(CHROOT)/$(TP_HOME)
 	hg clone --pull $(TP_REPO) $(CHROOT)/$(TP_HOME)/teamplayer
 	cp bash_profile $(CHROOT)$(TP_HOME)/.bash_profile
-	$(inroot) virtualenv-2.7 $(TP_HOME)
+	$(inroot) virtualenv $(TP_HOME)
 	$(inroot) bash -c ". $(TP_HOME)/bin/activate ; pip install -e $(TP_HOME)/teamplayer"
-	$(inroot) bash -c ". $(TP_HOME)/bin/activate ; pip install psycopg2 flup 'Whoosh<2.5.0' setproctitle"
+	$(inroot) bash -c ". $(TP_HOME)/bin/activate ; pip install psycopg2 flup Whoosh setproctitle"
 	$(inroot) bash -c ". $(TP_HOME)/bin/activate ; django-admin.py startproject project $(TP_HOME)"
 	chmod +x $(CHROOT)/$(TP_HOME)/manage.py
 	$(inroot) ln -sf ../manage.py $(TP_HOME)/bin/manage
diff --git a/teamplayer/package.accept_keywords b/teamplayer/package.accept_keywords
new file mode 100644
index 0000000..170c637
--- /dev/null
+++ b/teamplayer/package.accept_keywords
@@ -0,0 +1,5 @@
+dev-db/postgresql-base
+dev-db/postgresql-server
+dev-lang/python:2.7
+sys-kernel/gentoo-sources
+virtual/python-imaging
diff --git a/teamplayer/package.keywords b/teamplayer/package.keywords
deleted file mode 100644
index 69bffe3..0000000
--- a/teamplayer/package.keywords
+++ /dev/null
@@ -1,5 +0,0 @@
-dev-db/postgresql-base ~amd64 ~x86
-dev-db/postgresql-server ~amd64 ~x86
-dev-lang/python:2.7 ~amd64 ~x86
-sys-kernel/gentoo-sources ~amd64 ~x86
-virtual/python-imaging ~amd64 ~x86