diff --git a/Makefile.am b/Makefile.am
index 82bddfed..b06c00e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,12 @@
-if BUILD_RUBY
-DIR_R = ruby
-endif
-
 if BUILD_PERF
 DIR_PERF = perf
 endif
 
-SUBDIRS = src $(DIR_R) $(DIR_PERF) devices bindings
-DIST_SUBDIRS = src ruby perf devices bindings
+SUBDIRS = src $(DIR_PERF) devices bindings
+DIST_SUBDIRS = src perf devices bindings
 
 EXTRA_DIST =  $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2
 
 dist-hook:
 		-rm -rf $(distdir)/foreign/openpgm/@pgm_basename@
+
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 2b877ede..77b4ec24 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -6,6 +6,10 @@ if BUILD_PYTHON
 DIR_P = python
 endif
 
-SUBDIRS = $(DIR_J) $(DIR_P)
-DIST_SUBDIRS = java python
+if BUILD_RUBY
+DIR_R = ruby
+endif
+
+SUBDIRS = $(DIR_J) $(DIR_P) $(DIR_R)
+DIST_SUBDIRS = java python ruby
 
diff --git a/ruby/Makefile.am b/bindings/ruby/Makefile.am
similarity index 100%
rename from ruby/Makefile.am
rename to bindings/ruby/Makefile.am
diff --git a/ruby/extconf.rb b/bindings/ruby/extconf.rb
similarity index 100%
rename from ruby/extconf.rb
rename to bindings/ruby/extconf.rb
diff --git a/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp
similarity index 100%
rename from ruby/rbzmq.cpp
rename to bindings/ruby/rbzmq.cpp
diff --git a/configure.in b/configure.in
index eee00c36..f518509f 100644
--- a/configure.in
+++ b/configure.in
@@ -489,7 +489,7 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
 
 AC_OUTPUT(Makefile src/Makefile bindings/python/Makefile \
-    bindings/python/setup.py ruby/Makefile \
+    bindings/python/setup.py bindings/ruby/Makefile \
     bindings/java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \
     perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \
     devices/Makefile devices/zmq_forwarder/Makefile bindings/Makefile)