diff --git a/configure.ac b/configure.ac
index 593b66c..7d9a82e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -232,9 +232,8 @@
 have_ruby=no
 if test "$with_ruby" = "yes"; then
   AC_PATH_PROG([RUBY], [ruby])
-  AC_PATH_PROG([RAKE], [rake])
   AC_PATH_PROG([BUNDLER], [bundle])
-  if test "x$RUBY" != "x" -a "x$RAKE" != "x"; then
+  if test "x$RUBY" != "x" -a "x$BUNDLER" != "x"; then
     have_ruby="yes"
   fi
 fi
diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index 091c67f..300f676 100755
--- a/lib/rb/Makefile.am
+++ b/lib/rb/Makefile.am
@@ -29,21 +29,21 @@
 
 DESTDIR ?= /
 
-all-local:
 if HAVE_BUNDLER
+
+all-local:
 	$(BUNDLER) install
 	$(BUNDLER) exec rake
-endif
 
 install-exec-hook:
-	$(RAKE) install
+	$(BUNDLER) exec rake install
 
 clean-local:
-	$(RAKE) clean
+	$(BUNDLER) exec rake clean
 
 check-local: all
-if HAVE_BUNDLER
 	$(BUNDLER) install
 	$(BUNDLER) exec rake
+
 endif