diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 32a6a67..c923360 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -1,6 +1,7 @@
 (
     x11-wm/i3[~scm]
     media-sound/pnmixer[~scm]
+    x11-apps/terminator[~scm]
 ) [[
     *author = [ Julian Ospald <hasufell@posteo.de> ]
     *token = scm
diff --git a/packages/x11-apps/terminator/terminator-0.97.exheres-0 b/packages/x11-apps/terminator/terminator-0.97.exheres-0
deleted file mode 100644
index c0700a4..0000000
--- a/packages/x11-apps/terminator/terminator-0.97.exheres-0
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2014 Julian Ospald <hasufell@hasufell.de>
-# Distributed under the terms of the GNU General Public License v2
-
-if ever is_scm; then
-    SCM_REPOSITORY="http://bazaar.launchpad.net/~gnome-terminator/terminator/"
-    require scm-bzr
-else
-    require launchpad [ branch=trunk ]
-fi
-
-require gtk-icon-cache freedesktop-desktop
-require setup-py [ blacklist="3" import=distutils multibuild=false ]
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://gnometerminator.blogspot.de/p/introduction.html"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    run:
-        dev-libs/keybinder
-        dev-libs/vte:0
-        dev-python/notify-python[python_abis:*(-)?]
-        gnome-bindings/pygobject:2[python_abis:*(-)?]
-        gnome-bindings/pygtk:2[python_abis:*(-)?]
-    build:
-        dev-util/intltool
-"
-
-pkg_preinst() {
-    gtk-icon-cache_pkg_preinst
-}
-
-pkg_postinst() {
-    gtk-icon-cache_pkg_postinst
-    freedesktop-desktop_pkg_postinst
-}
-
-pkg_postrm() {
-    gtk-icon-cache_pkg_postrm
-    freedesktop-desktop_pkg_postrm
-}
diff --git a/packages/x11-apps/terminator/terminator-scm.exheres-0 b/packages/x11-apps/terminator/terminator-scm.exheres-0
index c0700a4..a377369 100644
--- a/packages/x11-apps/terminator/terminator-scm.exheres-0
+++ b/packages/x11-apps/terminator/terminator-scm.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2014 Julian Ospald <hasufell@hasufell.de>
+# Copyright 2014-2016 Julian Ospald <hasufell@hasufell.de>
 # Distributed under the terms of the GNU General Public License v2
 
 if ever is_scm; then
@@ -9,7 +9,8 @@ else
 fi
 
 require gtk-icon-cache freedesktop-desktop
-require setup-py [ blacklist="3" import=distutils multibuild=false ]
+require setup-py [ blacklist="3" import=distutils has_bin=true has_lib=true \
+                   multibuild=false ]
 
 DESCRIPTION="Multiple GNOME terminals in one window"
 HOMEPAGE="http://gnometerminator.blogspot.de/p/introduction.html"
@@ -21,7 +22,8 @@ PLATFORMS="~amd64 ~x86"
 DEPENDENCIES="
     run:
         dev-libs/keybinder
-        dev-libs/vte:0
+        dev-libs/vte
+        dev-python/psutil[python_abis:*(-)?]
         dev-python/notify-python[python_abis:*(-)?]
         gnome-bindings/pygobject:2[python_abis:*(-)?]
         gnome-bindings/pygtk:2[python_abis:*(-)?]
@@ -29,6 +31,11 @@ DEPENDENCIES="
         dev-util/intltool
 "
 
+src_install() {
+    setup-py_src_install
+    edo rm -r "${IMAGE}"/usr/bin
+}
+
 pkg_preinst() {
     gtk-icon-cache_pkg_preinst
 }