diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5268f9394..6bea9e8243 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,16 +145,6 @@ endif ()
 
 set(ARANGODB_VERSION "1.x.y-rc1" CACHE path "ArangoDB version")
 
-################################################################################
-### @brief MRUBY
-################################################################################
-
-option(USE_MRUBY "Do you want to use MRUBY" OFF)
-
-if (USE_MRUBY)
-  add_definitions("-DTRI_ENABLE_MRUBY=1")
-endif ()
-
 ################################################################################
 ### @brief VISTA LOCKS
 ################################################################################
diff --git a/GNUmakefile b/GNUmakefile
index eac904f672..0dbc8e7676 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -111,7 +111,6 @@ pack-dmg-cmake:
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		-D "LIBEV_VERSION=${LIBEV_VERSION}" \
 		-D "READLINE_VERSION=${READLINE_VERSION}" \
-		-D "USE_MRUBY=ON" \
 		-D "V8_VERSION=${V8_VERSION}" \
 		-D "ZLIB_VERSION=${ZLIB_VERSION}" \
 		..
@@ -119,7 +118,6 @@ pack-dmg-cmake:
 	${MAKE} .libev-build-64
 	${MAKE} .zlib-build-64
 	${MAKE} .v8-build-64
-	${MAKE} .mruby-build-64
 
 	${MAKE} ${BUILT_SOURCES}
 
@@ -144,8 +142,7 @@ pack-macosx:
 	rm -rf Build && mkdir Build
 
 	./configure \
-		--prefix=/opt/arangodb \
-		--enable-mruby
+		--prefix=/opt/arangodb
 
 	${MAKE} pack-macosx-cmake
 
@@ -159,7 +156,6 @@ pack-macosx-cmake:
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		-D "LIBEV_VERSION=${LIBEV_VERSION}" \
 		-D "READLINE_VERSION=${READLINE_VERSION}" \
-		-D "USE_MRUBY=ON" \
 		-D "V8_VERSION=${V8_VERSION}" \
 		-D "ZLIB_VERSION=${ZLIB_VERSION}" \
 		..
@@ -167,7 +163,6 @@ pack-macosx-cmake:
 	${MAKE} .libev-build-64
 	${MAKE} .zlib-build-64
 	${MAKE} .v8-build-64
-	${MAKE} .mruby-build-64
 
 	${MAKE} ${BUILT_SOURCES}
 
@@ -189,8 +184,7 @@ pack-arm:
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-mruby
+		--localstatedir=/var
 
 	touch .libev-build-32
 	touch .v8-build-32
@@ -211,7 +205,6 @@ pack-arm-cmake:
 		-D "ETCDIR=${sysconfdir}" \
 		-D "LIBEV_VERSION=${LIBEV_VERSION}" \
 		-D "READLINE_VERSION=${READLINE_VERSION}" \
-		-D "USE_MRUBY=OFF" \
 		-D "V8_VERSION=${V8_VERSION}" \
 		-D "VARDIR=${localstatedir}" \
 		-D "ZLIB_VERSION=${ZLIB_VERSION}" \
@@ -269,7 +262,6 @@ winXX-cmake: checkcmake
 		-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		-D "LIBEV_VERSION=4.11" \
-		-D "USE_MRUBY=OFF" \
 		-D "V8_VERSION=3.31.74.1" \
 		-D "ZLIB_VERSION=1.2.7" \
 		$(MOREOPTS) \
@@ -300,8 +292,7 @@ pack-tar-config:
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-mruby
+		--localstatedir=/var
 
 pack-tar:
 	rm -rf /tmp/pack-arangodb