diff --git a/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt b/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
index c3dae3bb9bb02351234a5ea4f471ca5a931cf5a4..bd4e9d48d96168b9f045d80606e54d75335fc4c3 100644
--- a/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
+++ b/docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
@@ -118,14 +118,14 @@ mkpop3dcert
 
 3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
-apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp libopenssl-ruby
+apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 
 # When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
-a2enmod suexec rewrite ssl actions include
+a2enmod suexec rewrite ssl actions include ruby
 
 # If you want to use webdav then run the following to enable the Apache webdav modules:
 
diff --git a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
index 21ec3a05796caeaa42f32dcb89f6fd37c2048065..20c6738b7b7bd2f8ba0aba8904628378a0ca1395 100644
--- a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
+++ b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
@@ -86,14 +86,14 @@ apt-get -y install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2
 
 3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
-apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp libopenssl-ruby
+apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 
 # When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
-a2enmod suexec rewrite ssl actions include
+a2enmod suexec rewrite ssl actions include ruby
 
 # If you want webdav then run the following to enable the Apache webdav modules:
 
diff --git a/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt b/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt
index 258b50f2410a9e1321d2e9cec866a66c550644c0..bdbb67d4b0fb9692726599cbc4f2bb27d7af3764 100644
--- a/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt
+++ b/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt
@@ -112,7 +112,7 @@ mkpop3dcert
 
 3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
-apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt imagemagick libapache2-mod-suphp libopenssl-ruby
+apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 #this package is actual missed on official squeeze repository: php5-imagick
 
@@ -120,7 +120,7 @@ apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
-a2enmod suexec rewrite ssl actions include
+a2enmod suexec rewrite ssl actions include ruby
 
 # If you want webdav then run the following to enable the Apache webdav modules:
 
diff --git a/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt
index 84b93cc1e2beb72d03e4c5879cbeeb0d26cf1cee..e3c62753c7a82cf6990a3899ff2221c8e21e9e94 100644
--- a/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt
+++ b/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt
@@ -84,14 +84,14 @@ apt-get -y install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2
 
 3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
-apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt imagemagick libapache2-mod-suphp libopenssl-ruby
+apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 
 # When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
-a2enmod suexec rewrite ssl actions include
+a2enmod suexec rewrite ssl actions include ruby
 
 # restart apache before continuing
 
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index f09766d4d49ed3e559c4df090ad700b2e2c34c82..beab7409e91f1f6b604d9a715ad5f8ce9afc53f5 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1064,6 +1064,7 @@ CREATE TABLE `web_domain` (
   `is_subdomainwww` tinyint(1) NOT NULL default '1',
   `subdomain` enum('none','www','*') NOT NULL default 'none',
   `php` varchar(32) NOT NULL default 'y',
+  `ruby` enum('n','y') NOT NULL default 'n',
   `redirect_type` varchar(255) default NULL,
   `redirect_path` varchar(255) default NULL,
   `ssl` enum('n','y') NOT NULL default 'n',
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 7b05352494ec4d3132ccf3028f58350d58fa1c8f..9d7a1c15fd9841276a40b284ecfa46826af8fc42 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -193,6 +193,12 @@ $form["tabs"]['domain'] = array (
 			'valuelimit' => 'client:web_php_options',
 			'value'		=> array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP')
 		),
+		'ruby' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'n',
+			'value'		=> array(0 => 'n',1 => 'y')
+		),
 		'active' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index b26014db98aaf3bda742610e1b7568ccdec8be6d..84ae4d064d1e580782f9b2e7cae7185e1507812f 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -58,4 +58,5 @@ $wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
 $wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
 $wb["php_open_basedir_txt"] = 'PHP open_basedir';
 $wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
 ?>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index d69a3f9935d6eed85bdd50799d7cc9f4964f5184..42c9ed192edaed4f582b178943509bc27d84152f 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -70,7 +70,13 @@
 					<div class="multiField">
 						{tmpl_var name='ssi'}
 					</div>
-			</div>
+	  </div>
+	  <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='ruby_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='ruby'}
+					</div>
+	  </div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='suexec_txt'}</p>
 					<div class="multiField">
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 9995e7605d10077f20713bb31d1a1c8fb60137c3..5d5f5da24c3eb4d1f620ec1092c4ff8569445ca3 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -66,6 +66,24 @@
         AddOutputFilter INCLUDES .shtml
         Options +Includes
 </tmpl_if>
+<tmpl_if name='ruby' op='==' value='y'>
+    <IfModule mod_ruby.c>
+      <Directory {tmpl_var name='web_document_root'}>
+        Options +ExecCGI
+      </Directory>
+      RubyRequire apache/ruby-run
+      #RubySafeLevel 0
+      <Files *.rb>
+        SetHandler ruby-object
+        RubyHandler Apache::RubyRun.instance
+      </Files>
+      <Files *.rbx>
+        SetHandler ruby-object
+        RubyHandler Apache::RubyRun.instance
+      </Files>
+    </IfModule>
+</tmpl_if>
+
 <tmpl_if name='php' op='==' value='no'>
         <Files ~ '.php[s3-6]{0,1}$'>
             Order allow,deny