diff --git a/programs/Makefile b/programs/Makefile
index 90033e28..6888e116 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -38,7 +38,10 @@ reboot: force_look tlib/libtlib.a
 shutdown: force_look tlib/libtlib.a
 	cd shutdown; $(MAKE) shutdown
 
-dist: one hello long loop longone longtwo keyboard tsh cpuid shutdown reboot
+args: force_look tlib/libtlib.a
+	cd args; $(MAKE) args
+
+dist: one hello long loop longone longtwo keyboard tsh cpuid shutdown reboot args
 	mkdir -p dist
 	cp one/a.out dist/one
 	cp hello/a.out dist/hello
@@ -51,6 +54,7 @@ dist: one hello long loop longone longtwo keyboard tsh cpuid shutdown reboot
 	cp tsh/tsh dist/
 	cp reboot/reboot dist/
 	cp shutdown/shutdown dist/
+	cp args/args dist/
 	strip dist/*
 
 force_look:
@@ -66,4 +70,7 @@ clean:
 	cd keyboard; $(MAKE) clean
 	cd tsh; $(MAKE) clean
 	cd cpuid; $(MAKE) clean
+	cd reboot; $(MAKE) clean
+	cd shutdown; $(MAKE) clean
+	cd args; $(MAKE) clean
 	rm -rf dist
diff --git a/programs/args/Makefile b/programs/args/Makefile
new file mode 100644
index 00000000..2b31c6df
--- /dev/null
+++ b/programs/args/Makefile
@@ -0,0 +1,15 @@
+.PHONY: default clean
+
+default: args
+
+include ../../cpp.mk
+
+%.cpp.o: src/%.cpp
+	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
+
+args: main.cpp.o
+	$(CC) -o args main.cpp.o $(PROGRAM_LINK_FLAGS)
+
+clean:
+	rm -f *.cpp.o
+	rm -rf args
diff --git a/programs/args/args b/programs/args/args
new file mode 100755
index 00000000..270e1e89
Binary files /dev/null and b/programs/args/args differ
diff --git a/programs/args/reboot b/programs/args/reboot
new file mode 100755
index 00000000..d5228f31
Binary files /dev/null and b/programs/args/reboot differ
diff --git a/programs/args/src/main.cpp b/programs/args/src/main.cpp
new file mode 100644
index 00000000..e8ab34a5
--- /dev/null
+++ b/programs/args/src/main.cpp
@@ -0,0 +1,14 @@
+//=======================================================================
+// Copyright Baptiste Wicht 2013-2014.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//=======================================================================
+
+#include <print.hpp>
+#include <system.hpp>
+
+int main(int argc, char* argv[]){
+    print_line(argc);
+    exit(0);
+}
\ No newline at end of file