diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index df11c10..6947d8f 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -28,20 +28,13 @@
 ########################################################################
 # Install python sources
 ########################################################################
+add_subdirectory(misc_utils)
+add_subdirectory(receiver)
+add_subdirectory(demapping)
+
 GR_PYTHON_INSTALL(
     FILES
-    __init__.py
-    demapping/gsm_bcch_ccch_demapper.py
-    demapping/gsm_bcch_ccch_sdcch4_demapper.py
-    demapping/gsm_sdcch8_demapper.py
-    receiver/gsm_input.py
-    receiver/fcch_burst_tagger.py
-    receiver/sch_detector.py
-    receiver/fcch_detector.py
-    receiver/chirpz.py
-    misc_utils/arfcn.py
-    misc_utils/clock_offset_corrector_tagged.py
-    misc_utils/hier_block.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+    __init__.py DESTINATION ${GR_PYTHON_DIR}/grgsm
 )
 
 ########################################################################
diff --git a/python/demapping/CMakeLists.txt b/python/demapping/CMakeLists.txt
new file mode 100644
index 0000000..fd6e112
--- /dev/null
+++ b/python/demapping/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright 2011,2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(FILES
+    gsm_bcch_ccch_demapper.py
+    gsm_bcch_ccch_sdcch4_demapper.py
+    gsm_sdcch8_demapper.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+)
diff --git a/python/misc_utils/CMakeLists.txt b/python/misc_utils/CMakeLists.txt
new file mode 100644
index 0000000..ffba1b7
--- /dev/null
+++ b/python/misc_utils/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright 2011,2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(FILES
+    arfcn.py
+    clock_offset_corrector_tagged.py
+    hier_block.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+)
diff --git a/python/receiver/CMakeLists.txt b/python/receiver/CMakeLists.txt
new file mode 100644
index 0000000..07fe2a4
--- /dev/null
+++ b/python/receiver/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright 2011,2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(FILES
+    gsm_input.py
+    fcch_burst_tagger.py
+    sch_detector.py
+    fcch_detector.py
+    chirpz.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+)