diff --git a/packages/archlinux/.gitignore b/packages/archlinux/python-powerline-git/.gitignore
similarity index 100%
rename from packages/archlinux/.gitignore
rename to packages/archlinux/python-powerline-git/.gitignore
diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD
new file mode 100644
index 00000000..e847c816
--- /dev/null
+++ b/packages/archlinux/python-powerline-git/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Kim Silkebækken <kim.silkebaekken+aur@gmail.com>
+
+pkgname=python-powerline-git
+pkgver=20130123
+pkgrel=1
+pkgdesc='The ultimate statusline/prompt utility.'
+url='https://github.com/Lokaltog/powerline'
+license=('CC BY-SA 3.0')
+arch=('any')
+depends=('python>=3.3')
+makedepends=('git' 'python-distribute')
+optdepends=('python-psutil: improved system information'
+	'python-pygit2: improved git support'
+	'zsh: better shell prompt')
+install='powerline.install'
+source=()
+
+_gitroot="https://github.com/Lokaltog/powerline.git"
+_gitname="powerline"
+_gitbranch="develop"
+
+build() {
+	cd ${srcdir}
+
+	msg "Connecting to GitHub..."
+
+	if [ -d ${srcdir}/${_gitname} ]; then
+		cd ${_gitname}
+		git pull origin ${_gitbranch}
+		msg "The local files are updated."
+	else
+		git clone ${_gitroot}
+		cd ${_gitname}
+		git checkout ${_gitbranch}
+	fi
+
+	msg "Git checkout done or server timeout."
+
+	python setup.py build || return 1
+	python setup.py install --root=${pkgdir} || return 1
+
+	msg2 "Installing fonts..."
+	install -dm755 "${pkgdir}/usr/share/fonts/TTF/"
+	install -dm755 "${pkgdir}/etc/fonts/conf.avail"
+	install -dm755 "${pkgdir}/etc/fonts/conf.d"
+	install -m644 "font/PowerlineSymbols.otf" "${pkgdir}/usr/share/fonts/TTF/PowerlineSymbols.otf"
+	install -m644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf"
+	ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf"
+
+	msg2 "Installing vim plugin..."
+	install -dm755 "${pkgdir}/usr/share/vim/vimfiles/plugin"
+	install -m644 "powerline/bindings/vim/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim"
+
+	msg2 "Installing zsh plugin..."
+	install -dm755 "${pkgdir}/usr/share/zsh/site-contrib"
+	install -m644 "powerline/bindings/zsh/powerline.zsh" "${pkgdir}/usr/share/zsh/site-contrib/powerline.zsh"
+
+	msg2 "Installing tmux configuration..."
+	install -dm755 "${pkgdir}/usr/share/tmux"
+	install -m644 "powerline/bindings/tmux/powerline.conf" "${pkgdir}/usr/share/tmux/powerline.conf"
+}
diff --git a/packages/archlinux/powerline.install b/packages/archlinux/python-powerline-git/powerline.install
similarity index 100%
rename from packages/archlinux/powerline.install
rename to packages/archlinux/python-powerline-git/powerline.install
diff --git a/packages/archlinux/python2-powerline-git/.gitignore b/packages/archlinux/python2-powerline-git/.gitignore
new file mode 100644
index 00000000..4ef5aeeb
--- /dev/null
+++ b/packages/archlinux/python2-powerline-git/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!PKGBUILD
+!*.install
diff --git a/packages/archlinux/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD
similarity index 97%
rename from packages/archlinux/PKGBUILD
rename to packages/archlinux/python2-powerline-git/PKGBUILD
index 1521e7bc..22f12170 100644
--- a/packages/archlinux/PKGBUILD
+++ b/packages/archlinux/python2-powerline-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kim Silkebækken <kim.silkebaekken+aur@gmail.com>
 
-pkgname=powerline-git
-pkgver=20130122
+pkgname=python2-powerline-git
+pkgver=20130123
 pkgrel=1
 pkgdesc='The ultimate statusline/prompt utility.'
 url='https://github.com/Lokaltog/powerline'
diff --git a/packages/archlinux/python2-powerline-git/powerline.install b/packages/archlinux/python2-powerline-git/powerline.install
new file mode 100644
index 00000000..8c8a9033
--- /dev/null
+++ b/packages/archlinux/python2-powerline-git/powerline.install
@@ -0,0 +1,43 @@
+post_install() {
+	echo "Updating font cache..."
+	fc-cache -f
+
+	echo "
+IMPORTANT
+=========
+
+Powerline requires custom glyphs to work properly. A font with these glyphs has 
+been installed along with a fontconfig file which enables the glyphs for many 
+common coding fonts.
+
+If Powerline doesn't work out of the box on your system, please submit an issue 
+on GitHub: https://github.com/Lokaltog/powerline/issues
+
+Consult the documentation for detailed installation instructions and 
+troubleshooting information: http://lokaltog.github.com/powerline/
+
+Vim installation
+----------------
+
+The plugin has been installed and is enabled by default.
+
+Zsh installation
+----------------
+
+Add the following line to your ~/.zshrc:
+
+    . /usr/share/zsh/site-contrib/powerline.zsh
+
+Tmux installation
+-----------------
+
+Add the following line to your ~/.tmux.conf:
+
+    source '/usr/share/tmux/powerline.conf'
+"
+}
+
+post_remove() {
+	echo "Updating font cache..."
+	fc-cache -f
+}