diff --git a/src/Mod/Surfaces/Icons/Makefile.am b/src/Mod/Surfaces/Icons/Makefile.am
new file mode 100644
index 000000000..d4400fedf
--- /dev/null
+++ b/src/Mod/Surfaces/Icons/Makefile.am
@@ -0,0 +1,22 @@
+# Change data dir from default $(datadir) to actual directory
+datadir = $(prefix)/Mod/Surfaces/Icons
+data_DATA = \
+		BorderIco.png \
+		BorderIco.xcf \
+		BorderIco.xpm \
+		ConvertIco.png \
+		ConvertIco.xcf \
+		ConvertTo4SidesIco.xpm \
+		Ico.png \
+		Ico.xcf \
+		Ico.xpm \
+		IsoCurveIco.png \
+		IsoCurveIco.xcf \
+		IsoCurveIco.xpm \
+		SliceIco.png \
+		SliceIco.xcf \
+		SliceIco.xpm
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt
diff --git a/src/Mod/Surfaces/Makefile.am b/src/Mod/Surfaces/Makefile.am
new file mode 100644
index 000000000..03c16fc0d
--- /dev/null
+++ b/src/Mod/Surfaces/Makefile.am
@@ -0,0 +1,12 @@
+SUBDIRS=Icons surfBorder surfConvert surfISOCurve surfSlice surfUtils
+
+# Change data dir from default ($(prefix)/share) to actual dir
+datadir = $(prefix)/Mod/Surfaces
+
+data_DATA = InitGui.py SurfGui.py
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt \
+		README \
+		surfaces.dox
diff --git a/src/Mod/Surfaces/surfBorder/Makefile.am b/src/Mod/Surfaces/surfBorder/Makefile.am
new file mode 100644
index 000000000..8962f936d
--- /dev/null
+++ b/src/Mod/Surfaces/surfBorder/Makefile.am
@@ -0,0 +1,8 @@
+# Change data dir from default $(datadir) to actual directory
+datadir = $(prefix)/Mod/Surfaces/surfBorder
+data_DATA = \
+		__init__.py
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt
diff --git a/src/Mod/Surfaces/surfConvert/Makefile.am b/src/Mod/Surfaces/surfConvert/Makefile.am
new file mode 100644
index 000000000..0f840248d
--- /dev/null
+++ b/src/Mod/Surfaces/surfConvert/Makefile.am
@@ -0,0 +1,11 @@
+# Change data dir from default $(datadir) to actual directory
+datadir = $(prefix)/Mod/Surfaces/surfConvert
+data_DATA = \
+		__init__.py \
+		Preview.py \
+		TaskPanel.py \
+		TaskPanel.ui
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt
diff --git a/src/Mod/Surfaces/surfISOCurve/Makefile.am b/src/Mod/Surfaces/surfISOCurve/Makefile.am
new file mode 100644
index 000000000..e6f9abe91
--- /dev/null
+++ b/src/Mod/Surfaces/surfISOCurve/Makefile.am
@@ -0,0 +1,12 @@
+# Change data dir from default $(datadir) to actual directory
+datadir = $(prefix)/Mod/Surfaces/surfISOCurve
+data_DATA = \
+		__init__.py \
+		PointTracker.py \
+		Preview.py \
+		TaskPanel.py \
+		TaskPanel.ui
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt
diff --git a/src/Mod/Surfaces/surfSlice/Makefile.am b/src/Mod/Surfaces/surfSlice/Makefile.am
new file mode 100644
index 000000000..13f6a4468
--- /dev/null
+++ b/src/Mod/Surfaces/surfSlice/Makefile.am
@@ -0,0 +1,12 @@
+# Change data dir from default $(datadir) to actual directory
+datadir = $(prefix)/Mod/Surfaces/surfSlice
+data_DATA = \
+		__init__.py \
+		PointTracker.py \
+		Preview.py \
+		TaskPanel.py \
+		TaskPanel.ui
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt
diff --git a/src/Mod/Surfaces/surfUtils/Makefile.am b/src/Mod/Surfaces/surfUtils/Makefile.am
new file mode 100644
index 000000000..283b8c100
--- /dev/null
+++ b/src/Mod/Surfaces/surfUtils/Makefile.am
@@ -0,0 +1,12 @@
+# Change data dir from default $(datadir) to actual directory
+datadir = $(prefix)/Mod/Surfaces/surfUtils
+data_DATA = \
+		Geometry.py \
+		__init__.py \
+		Math.py \
+		Paths.py \
+		Translator.py
+
+EXTRA_DIST = \
+		$(data_DATA) \
+		CMakeLists.txt