diff --git a/bootstrap.sh b/bootstrap.sh
index 59e0007..d2e240a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-subdirs="compiler/cpp lib/cpp lib/py"
+subdirs="compiler/cpp lib/cpp lib/py if"
 
 ./cleanup.sh
 echo "SUBDIRS = ${subdirs}" > Makefile.am
diff --git a/cleanup.sh b/cleanup.sh
index 5c0046d..c7f5054 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-subdirs="compiler/cpp lib/cpp lib/py"
+subdirs="compiler/cpp lib/cpp lib/py if"
 
 rm -rf \
 AUTHORS \
diff --git a/configure.ac b/configure.ac
index eca327d..9a4aeb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,6 @@
 
 AC_CONFIG_FILES([Makefile])
 
-AC_CONFIG_SUBDIRS([compiler/cpp lib/cpp lib/py])
+AC_CONFIG_SUBDIRS([compiler/cpp lib/cpp lib/py if])
 
 AC_OUTPUT
diff --git a/if/Makefile.am b/if/Makefile.am
new file mode 100644
index 0000000..2f269f1
--- /dev/null
+++ b/if/Makefile.am
@@ -0,0 +1,3 @@
+thrift_ifdir = $(datadir)/thrift/if
+dist_thrift_if_DATA = \
+                      reflection_limited.thrift
diff --git a/if/bootstrap.sh b/if/bootstrap.sh
new file mode 100755
index 0000000..b79e431
--- /dev/null
+++ b/if/bootstrap.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+./cleanup.sh
+aclocal
+touch NEWS README AUTHORS ChangeLog
+autoconf
+automake -ac
diff --git a/if/cleanup.sh b/if/cleanup.sh
new file mode 100755
index 0000000..1e35bfe
--- /dev/null
+++ b/if/cleanup.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+rm -rf \
+AUTHORS \
+ChangeLog \
+COPYING \
+INSTALL \
+Makefile \
+Makefile.in \
+NEWS \
+README \
+aclocal.m4 \
+autom4te.cache \
+config.log \
+config.status \
+config.sub \
+configure \
+install-sh \
+missing
diff --git a/if/configure.ac b/if/configure.ac
new file mode 100644
index 0000000..df0363b
--- /dev/null
+++ b/if/configure.ac
@@ -0,0 +1,11 @@
+AC_PREREQ(2.59)
+
+AC_INIT([thriftif], [1.0])
+
+AC_CONFIG_AUX_DIR([.])
+
+AM_INIT_AUTOMAKE
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT