diff --git a/puke b/puke
index b9295466..7be32ff9 100755
--- a/puke
+++ b/puke
@@ -114,15 +114,10 @@ pkg_build() {
     log "Sucessfully built $pkg."
 }
 
-pkg_manifest() (
-    cd "$pkg_dir"
-
-    _() { find . -mindepth 1 "$@" | sed 's/^\.//'; }
-    _ -not -type d  > "$OLDPWD/manifest"
-    _ -type d | sort -r >> "$OLDPWD/manifest"
-
-    cp "$OLDPWD/manifest" "$pkg_dir/$dbs_dir/$name"
-)
+pkg_manifest() {
+    find "$pkg_dir" -mindepth 1 | sed "s|^$pkg_dir||" | sort -r > manifest
+    cp manifest "$pkg_dir/$dbs_dir/$name"
+}
 
 pkg_tar() {
     cd "$bin_dir"
diff --git a/repo/hummingbird/manifest b/repo/hummingbird/manifest
index 5eec614f..32fd2a21 100644
--- a/repo/hummingbird/manifest
+++ b/repo/hummingbird/manifest
@@ -1,17 +1,17 @@
-/usr/bin/shutdown
-/usr/bin/hummingbird
-/usr/bin/reboot
+/var/db/puke/hummingbird/version
 /var/db/puke/hummingbird/sources
 /var/db/puke/hummingbird/manifest
 /var/db/puke/hummingbird/checksums
 /var/db/puke/hummingbird/build
-/var/db/puke/hummingbird/version
-/etc/rc.shutdown
-/etc/rc.init
 /var/db/puke/hummingbird
 /var/db/puke
 /var/db
 /var
+/usr/bin/shutdown
+/usr/bin/reboot
+/usr/bin/hummingbird
 /usr/bin
 /usr
+/etc/rc.shutdown
+/etc/rc.init
 /etc