diff --git a/deploy.sh b/deploy.sh
index 566dee3..014abd5 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,8 +2,8 @@
 
 set -e
 
+patch /usr/bin/makepkg < makepkg.patch
+
 puppet apply manifests/main.pp --modulepath=modules/ --verbose
 
-patch /usr/bin/makepkg < makepkg.patch
-puppet apply manifests/packages.pp --modulepath=modules/ --verbose
 patch /usr/bin/makepkg -R < makepkg.patch
diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp
index 6ae7ffd..9930514 100644
--- a/modules/yaourt/manifests/init.pp
+++ b/modules/yaourt/manifests/init.pp
@@ -1,5 +1,7 @@
 class yaourt {
   include 'yaourt::files'
 
+  include 'yaourt::packages';
+
   include 'yaourt::keys'
 }
diff --git a/manifests/packages.pp b/modules/yaourt/manifests/packages.pp
similarity index 98%
rename from manifests/packages.pp
rename to modules/yaourt/manifests/packages.pp
index b906ee2..f4ad5b6 100644
--- a/manifests/packages.pp
+++ b/modules/yaourt/manifests/packages.pp
@@ -1,4 +1,4 @@
-node default {
+class yaourt::packages () {
   package {[
     'acpi',
     'advanced-ssh-config',