diff --git a/configure.ac b/configure.ac
index 84986fa0c3086d90f7722c6472f5a41a41564f94..dae11aec8a402fcd7dfc06c3574c458fcbfd6cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,10 @@ AC_CONFIG_FILES([dumux.pc
     dumux/decoupled/2p2c/Makefile 
     dumux/decoupled/common/Makefile
     dumux/decoupled/common/fv/Makefile 
+	dumux/freeflow/Makefile
+	dumux/freeflow/stokes/Makefile
+	dumux/freeflow/stokes2c/Makefile
+	dumux/freeflow/stokes2cni/Makefile
     dumux/io/Makefile
     dumux/linear/Makefile
     dumux/material/Makefile 
@@ -80,7 +84,11 @@ AC_CONFIG_FILES([dumux.pc
     test/decoupled/2p/Makefile
     test/decoupled/2padaptive/Makefile
     test/decoupled/2p2c/Makefile
-    test/material/Makefile
+    test/freeflow/Makefile
+	test/freeflow/stokes/Makefile
+	test/freeflow/stokes2c/Makefile
+	test/freeflow/stokes2cni/Makefile
+	test/material/Makefile
     test/material/tabulation/Makefile
     test/material/ncpflash/Makefile
     test/material/fluidsystems/Makefile
diff --git a/dumux/freeflow/Makefile.am b/dumux/freeflow/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..a9e1a452786a3862538f63ecae5d5c9dc0933bb0
--- /dev/null
+++ b/dumux/freeflow/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = stokes stokes2c stokes2cni
+
+freeflowdir = $(includedir)/dumux/freeflow
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/freeflow/stokes/Makefile.am b/dumux/freeflow/stokes/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..e056afaf2c2be7584794157d3104816507c80148
--- /dev/null
+++ b/dumux/freeflow/stokes/Makefile.am
@@ -0,0 +1,4 @@
+new_stokesdir = $(includedir)/dumux/freeflow/new_stokes
+new_stokes_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/freeflow/stokes2c/Makefile.am b/dumux/freeflow/stokes2c/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..c694917e6a3be2ce55046f7cc07d47d50c6d2243
--- /dev/null
+++ b/dumux/freeflow/stokes2c/Makefile.am
@@ -0,0 +1,4 @@
+new_stokes2cdir = $(includedir)/dumux/freeflow/new_stokes2c
+new_stokes2c_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/freeflow/stokes2cni/Makefile.am b/dumux/freeflow/stokes2cni/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..c31923e220ed143bd03c23b08e4b88e9cdf3f93b
--- /dev/null
+++ b/dumux/freeflow/stokes2cni/Makefile.am
@@ -0,0 +1,4 @@
+new_stokes2cnidir = $(includedir)/dumux/freeflow/new_stokes2cni
+new_stokes2cni_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/Makefile.am b/test/freeflow/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..79abfa7f10df6d9597be03f9963edab4afb037df
--- /dev/null
+++ b/test/freeflow/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = stokes stokes2c stokes2cni
+
+include $(top_srcdir)/am/global-rules
+
diff --git a/test/freeflow/stokes/Makefile.am b/test/freeflow/stokes/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..750431112f90b370683ce3f191e1b4f803a24741
--- /dev/null
+++ b/test/freeflow/stokes/Makefile.am
@@ -0,0 +1,5 @@
+check_PROGRAMS = test_stokes
+
+test_stokes_SOURCES = test_stokes.cc
+
+include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2c/Makefile.am b/test/freeflow/stokes2c/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..9ef46bc7dd8dc673b29345ed32b0a0e02a20b591
--- /dev/null
+++ b/test/freeflow/stokes2c/Makefile.am
@@ -0,0 +1,5 @@
+check_PROGRAMS = test_stokes2c
+
+test_stokes2c_SOURCES = test_stokes2c.cc
+
+include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2cni/Makefile.am b/test/freeflow/stokes2cni/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..c1d9cb62d4d74bcba5e22a6a73243119c5c7e309
--- /dev/null
+++ b/test/freeflow/stokes2cni/Makefile.am
@@ -0,0 +1,5 @@
+check_PROGRAMS = test_stokes2cni
+
+test_stokes2cni_SOURCES = test_stokes2cni.cc
+
+include $(top_srcdir)/am/global-rules