diff --git a/Makefile b/Makefile
index 1fc49fe..c56b44d 100644
--- a/Makefile
+++ b/Makefile
@@ -271,13 +271,11 @@
 		$(MAKE) install-local
 
 .RECIPE: manifest
-manifest:
-	cd verilog/rtl/ && \
-	find * -type f ! -name "user_*.v" ! -name "manifest" ! -name "README" ! -name "defines.v" -exec shasum {} \; > manifest && \
-	cd ../../maglef/ && \
-	shasum *.mag > manifest && \
-	cd ../mag/ && \
-	shasum caravel.mag .magicrc > manifest
+manifest: mag/ maglef/ verilog/rtl/ Makefile
+	touch manifest && \
+	find verilog/rtl/* -type f ! -name "user_*.v" ! -name "manifest" ! -name "README" ! -name "defines.v" -exec shasum {} \; > manifest && \
+	find maglef/*.mag -type f ! -name "user_project_wrapper.mag" -exec shasum {} \; >> manifest && \
+	shasum mag/caravel.mag mag/.magicrc >> manifest
 
 
 check-env:
diff --git a/mag/manifest b/mag/manifest
deleted file mode 100644
index bab8806..0000000
--- a/mag/manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-0fb69c2825dbd6b9fb1028daf314f386263d0086  caravel.mag
-08dd27da4e7fa8b9757c8ce8c87dc3397f1f0027  .magicrc
diff --git a/maglef/manifest b/maglef/manifest
deleted file mode 100644
index 3bd3f72..0000000
--- a/maglef/manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-bd217958f82cc920ad517215b64de7881043b4d0  chip_io.mag
-0596a994ebb59aa6f8892dde6060cb1bddb65a82  digital_pll.mag
-f15b20be036891017ae88e4c926eb54eddb892d9  gpio_control_block.mag
-a54426257f9f5a10515ed5db3ff40aab56e0298f  mgmt_core.mag
-6bd83ca8fd6da8735f713e3c782302417272da05  mgmt_protect_hv.mag
-01cb0a625572c60a49dc25736329164800993739  mgmt_protect.mag
-280a4bc938d8fd3b6208d2b324835c19bd194de0  mprj2_logic_high.mag
-d0ad23504023314d6cc5fc2e71c881ca468f3c69  mprj_logic_high.mag
-ccd1692a5c7a5aa90744666697657f48af92a79b  simple_por.mag
-d8e1539cc77e46867d5898bb153da9c5fc4af4e5  sky130_fd_sc_hvl__lsbufhv2lv_1_wrapped.mag
-be002ace934eb2941d8424362bca992622d58342  sram_1rw1r_32_256_8_sky130.mag
-cafacc0d89db56de42a6ec8381313ee37ebcecb3  storage.mag
-901cc6df77916c7716aa8721226270dd36749118  user_id_programming.mag
-f71c55477e31e7087fa734728ab446b98b0c8f96  user_project_wrapper.mag
diff --git a/manifest b/manifest
new file mode 100644
index 0000000..8845660
--- /dev/null
+++ b/manifest
@@ -0,0 +1,53 @@
+d328f88dd48e015bbaa95e0d7c88954343cc5632  verilog/rtl/DFFRAM.v
+dab57f3c5464ce3354219840dae589a3fcd27135  verilog/rtl/DFFRAMBB.v
+46a8e0cab91f460de543c77ad6ef987af87b11bd  verilog/rtl/caravel.v
+b2feeb2a098894d5d731a5b011858a471e855d73  verilog/rtl/caravel_clocking.v
+583f964ef2cfb8f1cb9ebfb01aa29842d3a6e187  verilog/rtl/caravel_netlists.v
+2f81d7936062037160cfdad06997cc0b84439511  verilog/rtl/chip_io.v
+d772308bd2a72121d7ed9dcdd40c8e6cbbe4b43c  verilog/rtl/clock_div.v
+f937b52e53d45bdbe41bcbd07c65b41104c21756  verilog/rtl/convert_gpio_sigs.v
+a16f89c8efa638eab43641ab7047bb8eeedd6fa6  verilog/rtl/counter_timer_high.v
+d8eab2f4cef158e3c7800778ffc2367ab4abe130  verilog/rtl/counter_timer_low.v
+fff2d08e49701312c2ebd6714b7425baf83f3d35  verilog/rtl/digital_pll.v
+ce49f9af199b5f16d2c39c417d58e5890bc7bab2  verilog/rtl/digital_pll_controller.v
+3588d4fbd0bd941be329ff0697ac2585e9036186  verilog/rtl/gpio_control_block.v
+57554b3586f306944b31718a8c52526fa9a8a574  verilog/rtl/gpio_wb.v
+baf3aba29655ca7021398ddc3f68be81eff0fa0c  verilog/rtl/housekeeping_spi.v
+0544035d9f2bfc52ebcb3220a21f29e98a3784b4  verilog/rtl/la_wb.v
+ff3e65a783f3807340e25efac9207787d39fb6cd  verilog/rtl/mem_wb.v
+65feb79043201d3609307a3dd5af4e75cc26e81b  verilog/rtl/mgmt_core.v
+4d42909e102c472504739bc37559c6a34fd85ae1  verilog/rtl/mgmt_protect.v
+3b1ff20593bc386d13f5e2cf1571f08121889957  verilog/rtl/mgmt_protect_hv.v
+990e80add8b881f67d70eb52663dd885fddb8f7a  verilog/rtl/mgmt_soc.v
+9816acedf3dc3edd193861cc217ec46180ac1cdd  verilog/rtl/mprj2_logic_high.v
+93eb7aa0f8489715145ff0870737fecf8be1fa8c  verilog/rtl/mprj_ctrl.v
+2586a4c06bb540a5ca3803223f972243a2bbc1cc  verilog/rtl/mprj_io.v
+d4dba320b923398939fcc45ed9db8ed61d71dcdf  verilog/rtl/mprj_logic_high.v
+eac1e6d413cdfbc2f802e229ae5058828e01be1e  verilog/rtl/pads.v
+b5aff2fda5078cfda377b98337fcc91040815fc2  verilog/rtl/picorv32.v
+669d16642d5dd5f6824812754db20db98c9fe17b  verilog/rtl/ring_osc2x13.v
+6864cc10dacfd3edb4c66825b7a301ab097cea0d  verilog/rtl/simple_por.v
+917aa6e1bb869f973c79fb2c7894eab882ead74c  verilog/rtl/simple_spi_master.v
+293532d95583330278f9608fa1833cdae33a052d  verilog/rtl/simpleuart.v
+46bca62460c4dbfac30233318b24c3d526a40058  verilog/rtl/sky130_fd_sc_hvl__lsbufhv2lv_1_wrapped.v
+4501cd26dbf73787602b4c29324d0ba0c5caf46e  verilog/rtl/spimemio.v
+3b4c3de623f8af0f0780f1e5b0f2217ef6406a2f  verilog/rtl/sram_1rw1r_32_256_8_sky130.v
+8dea2030f1f59fc58ce50d943c395b8041ff1fb3  verilog/rtl/storage.v
+7e8d789570ed224df49cf61f69593cc738790a5d  verilog/rtl/storage_bridge_wb.v
+5e314e94a13d7291117123395ae088e1d17cf487  verilog/rtl/sysctrl.v
+e6246df6bbf0860a331b3547d64f7d235b0eca9a  verilog/rtl/wb_intercon.v
+bd217958f82cc920ad517215b64de7881043b4d0  maglef/chip_io.mag
+0596a994ebb59aa6f8892dde6060cb1bddb65a82  maglef/digital_pll.mag
+f15b20be036891017ae88e4c926eb54eddb892d9  maglef/gpio_control_block.mag
+a54426257f9f5a10515ed5db3ff40aab56e0298f  maglef/mgmt_core.mag
+01cb0a625572c60a49dc25736329164800993739  maglef/mgmt_protect.mag
+6bd83ca8fd6da8735f713e3c782302417272da05  maglef/mgmt_protect_hv.mag
+280a4bc938d8fd3b6208d2b324835c19bd194de0  maglef/mprj2_logic_high.mag
+d0ad23504023314d6cc5fc2e71c881ca468f3c69  maglef/mprj_logic_high.mag
+ccd1692a5c7a5aa90744666697657f48af92a79b  maglef/simple_por.mag
+d8e1539cc77e46867d5898bb153da9c5fc4af4e5  maglef/sky130_fd_sc_hvl__lsbufhv2lv_1_wrapped.mag
+be002ace934eb2941d8424362bca992622d58342  maglef/sram_1rw1r_32_256_8_sky130.mag
+cafacc0d89db56de42a6ec8381313ee37ebcecb3  maglef/storage.mag
+901cc6df77916c7716aa8721226270dd36749118  maglef/user_id_programming.mag
+0fb69c2825dbd6b9fb1028daf314f386263d0086  mag/caravel.mag
+08dd27da4e7fa8b9757c8ce8c87dc3397f1f0027  mag/.magicrc
diff --git a/verilog/rtl/manifest b/verilog/rtl/manifest
deleted file mode 100644
index 24f9d12..0000000
--- a/verilog/rtl/manifest
+++ /dev/null
@@ -1,38 +0,0 @@
-d328f88dd48e015bbaa95e0d7c88954343cc5632  DFFRAM.v
-dab57f3c5464ce3354219840dae589a3fcd27135  DFFRAMBB.v
-46a8e0cab91f460de543c77ad6ef987af87b11bd  caravel.v
-b2feeb2a098894d5d731a5b011858a471e855d73  caravel_clocking.v
-583f964ef2cfb8f1cb9ebfb01aa29842d3a6e187  caravel_netlists.v
-2f81d7936062037160cfdad06997cc0b84439511  chip_io.v
-d772308bd2a72121d7ed9dcdd40c8e6cbbe4b43c  clock_div.v
-f937b52e53d45bdbe41bcbd07c65b41104c21756  convert_gpio_sigs.v
-a16f89c8efa638eab43641ab7047bb8eeedd6fa6  counter_timer_high.v
-d8eab2f4cef158e3c7800778ffc2367ab4abe130  counter_timer_low.v
-fff2d08e49701312c2ebd6714b7425baf83f3d35  digital_pll.v
-ce49f9af199b5f16d2c39c417d58e5890bc7bab2  digital_pll_controller.v
-3588d4fbd0bd941be329ff0697ac2585e9036186  gpio_control_block.v
-57554b3586f306944b31718a8c52526fa9a8a574  gpio_wb.v
-baf3aba29655ca7021398ddc3f68be81eff0fa0c  housekeeping_spi.v
-0544035d9f2bfc52ebcb3220a21f29e98a3784b4  la_wb.v
-ff3e65a783f3807340e25efac9207787d39fb6cd  mem_wb.v
-65feb79043201d3609307a3dd5af4e75cc26e81b  mgmt_core.v
-4d42909e102c472504739bc37559c6a34fd85ae1  mgmt_protect.v
-3b1ff20593bc386d13f5e2cf1571f08121889957  mgmt_protect_hv.v
-990e80add8b881f67d70eb52663dd885fddb8f7a  mgmt_soc.v
-9816acedf3dc3edd193861cc217ec46180ac1cdd  mprj2_logic_high.v
-93eb7aa0f8489715145ff0870737fecf8be1fa8c  mprj_ctrl.v
-2586a4c06bb540a5ca3803223f972243a2bbc1cc  mprj_io.v
-d4dba320b923398939fcc45ed9db8ed61d71dcdf  mprj_logic_high.v
-eac1e6d413cdfbc2f802e229ae5058828e01be1e  pads.v
-b5aff2fda5078cfda377b98337fcc91040815fc2  picorv32.v
-669d16642d5dd5f6824812754db20db98c9fe17b  ring_osc2x13.v
-6864cc10dacfd3edb4c66825b7a301ab097cea0d  simple_por.v
-917aa6e1bb869f973c79fb2c7894eab882ead74c  simple_spi_master.v
-293532d95583330278f9608fa1833cdae33a052d  simpleuart.v
-46bca62460c4dbfac30233318b24c3d526a40058  sky130_fd_sc_hvl__lsbufhv2lv_1_wrapped.v
-4501cd26dbf73787602b4c29324d0ba0c5caf46e  spimemio.v
-3b4c3de623f8af0f0780f1e5b0f2217ef6406a2f  sram_1rw1r_32_256_8_sky130.v
-8dea2030f1f59fc58ce50d943c395b8041ff1fb3  storage.v
-7e8d789570ed224df49cf61f69593cc738790a5d  storage_bridge_wb.v
-5e314e94a13d7291117123395ae088e1d17cf487  sysctrl.v
-e6246df6bbf0860a331b3547d64f7d235b0eca9a  wb_intercon.v