diff --git a/Makefile.am b/Makefile.am
index 902e2b38..72ff820f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
-SUBDIRS = activities po shell sugar tools threadframe
+SUBDIRS = activities bindings po shell sugar tools
+
+ACLOCAL_AMFLAGS = -I m4
 
 dbusconfdir = $(pkgdatadir)
 dbusconf_DATA = dbus-installed.conf
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
new file mode 100644
index 00000000..2f2d292d
--- /dev/null
+++ b/bindings/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = threadframe
diff --git a/threadframe/GNUmakefile.mingw2 b/bindings/threadframe/GNUmakefile.mingw2
similarity index 100%
rename from threadframe/GNUmakefile.mingw2
rename to bindings/threadframe/GNUmakefile.mingw2
diff --git a/threadframe/Makefile.am b/bindings/threadframe/Makefile.am
similarity index 100%
rename from threadframe/Makefile.am
rename to bindings/threadframe/Makefile.am
diff --git a/threadframe/README b/bindings/threadframe/README
similarity index 100%
rename from threadframe/README
rename to bindings/threadframe/README
diff --git a/threadframe/sample.txt b/bindings/threadframe/sample.txt
similarity index 100%
rename from threadframe/sample.txt
rename to bindings/threadframe/sample.txt
diff --git a/threadframe/setup.py b/bindings/threadframe/setup.py
similarity index 100%
rename from threadframe/setup.py
rename to bindings/threadframe/setup.py
diff --git a/threadframe/test.py b/bindings/threadframe/test.py
similarity index 100%
rename from threadframe/test.py
rename to bindings/threadframe/test.py
diff --git a/threadframe/threadframe.def b/bindings/threadframe/threadframe.def
similarity index 100%
rename from threadframe/threadframe.def
rename to bindings/threadframe/threadframe.def
diff --git a/threadframe/threadframemodule.c b/bindings/threadframe/threadframemodule.c
similarity index 100%
rename from threadframe/threadframemodule.c
rename to bindings/threadframe/threadframemodule.c
diff --git a/configure.ac b/configure.ac
index 5afbf87d..9e77e368 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,8 @@ activities/browser/Makefile
 activities/chat/Makefile
 activities/groupchat/Makefile
 activities/terminal/Makefile
+bindings/Makefile
+bindings/threadframe/Makefile
 shell/Makefile
 shell/data/Makefile
 shell/home/Makefile
@@ -55,5 +57,4 @@ sugar/presence/Makefile
 po/Makefile.in
 tools/Makefile
 tools/sugar-setup-activity
-threadframe/Makefile
 ])