diff --git a/.gitignore b/.gitignore
index 6296f20..b5feeb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ bin/
 build/
 cache/
 target/
-
+packages/forensics
diff --git a/mkpuzzles b/mkpuzzles
index f0903a3..7314f92 100755
--- a/mkpuzzles
+++ b/mkpuzzles
@@ -77,22 +77,27 @@ for dn in $indir/[0-9]*; do
     touch $tgt/index.html
 
     if [ -f $dn/Makefile ]; then
-        # If there's a makefile, run make
-        make -C $dn DESTDIR=$(pwd)/$tgt || exit 1
+        # If there's a Makefile, run make
+        make -C $dn || exit 1
         files=$(cd $tgt; echo *)
+    fi
+
+    if [ -f $dn/@manifest.txt ]; then
+        # If there's a manifest, use that
+        files=$(cat $dn/@manifest.txt)
     else
         # Otherwise, look for special files and copy the rest
         files=
         for fn in $dn/*; do
             case $(basename $fn) in
                 @*)
-                # Handle meta-information later
+                    # Handle meta-information later
                     ;;
                 *~|"#"*)
-                # Don't copy temporary or backup files
+                    # Don't copy temporary or backup files
                     ;;
                 ,*)
-                # Copy but don't list
+                    # Copy but don't list
                     ln -f $fn $tgt/
                     ;;
                 *)
diff --git a/packages/logger/src/arc4.c b/packages/logger/src/arc4.c
new file mode 120000
index 0000000..4dcde89
--- /dev/null
+++ b/packages/logger/src/arc4.c
@@ -0,0 +1 @@
+../../../src/arc4.c
\ No newline at end of file
diff --git a/packages/logger/src/arc4.h b/packages/logger/src/arc4.h
new file mode 120000
index 0000000..a5d8c7a
--- /dev/null
+++ b/packages/logger/src/arc4.h
@@ -0,0 +1 @@
+../../../src/arc4.h
\ No newline at end of file