diff --git a/Makefile b/Makefile
index 6a317037..3c0b4623 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,6 @@ PICRIN_SRCS = \
 	src/init_contrib.c
 PICRIN_OBJS = \
 	$(PICRIN_SRCS:.c=.o)
-PICRIN_LIBS = \
-	piclib/picrin/macro.scm
 
 CONTRIB_SRCS =
 CONTRIB_OBJS = $(CONTRIB_SRCS:.c=.o)
@@ -33,8 +31,8 @@ debug: bin/picrin
 bin/picrin: $(PICRIN_OBJS) $(CONTRIB_OBJS) lib/libbenz.a
 	$(CC) $(CFLAGS) -o $@ $(PICRIN_OBJS) $(CONTRIB_OBJS) lib/libbenz.a $(LDFLAGS)
 
-src/load_piclib.c: $(PICRIN_LIBS) $(CONTRIB_LIBS)
-	perl etc/mkloader.pl $(PICRIN_LIBS) $(CONTRIB_LIBS) > $@
+src/load_piclib.c: $(CONTRIB_LIBS)
+	perl etc/mkloader.pl $(CONTRIB_LIBS) > $@
 
 src/init_contrib.c:
 	perl etc/mkinit.pl $(CONTRIB_INITS) > $@
diff --git a/piclib/picrin/macro.scm b/contrib/10.macro/macro.scm
similarity index 100%
rename from piclib/picrin/macro.scm
rename to contrib/10.macro/macro.scm
diff --git a/contrib/10.macro/nitro.mk b/contrib/10.macro/nitro.mk
new file mode 100644
index 00000000..a426ad2a
--- /dev/null
+++ b/contrib/10.macro/nitro.mk
@@ -0,0 +1,6 @@
+CONTRIB_LIBS += $(wildcard contrib/10.macro/*.scm)
+
+CONTRIB_TESTS += test-macro
+
+test-macro: bin/picrin
+	bin/picrin contrib/10.macro/t/ir-macro.scm
diff --git a/t/ir-macro.scm b/contrib/10.macro/t/ir-macro.scm
similarity index 100%
rename from t/ir-macro.scm
rename to contrib/10.macro/t/ir-macro.scm