diff --git a/railties/configs/databases/ibm_db.yml b/railties/configs/databases/ibm_db.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a9716ddb4459b6defeef43feb3cc6d1a4ec1f0a3
--- /dev/null
+++ b/railties/configs/databases/ibm_db.yml
@@ -0,0 +1,62 @@
+# IBM Dataservers
+#
+# Home Page
+#   http://rubyforge.org/projects/rubyibm/
+#
+# To install the ibm_db gem:
+#   On Linux:
+#     Source the db2profile file and set the necessary environment variables:
+#
+#       . /home/db2inst1/sqllib/db2profile
+#       export IBM_DB_DIR=/opt/ibm/db2/V9.1
+#       export IBM_DB_LIB=/opt/ibm/db2/V9.1/lib32
+#
+#     Then issue the command: gem install ibm_db
+#
+#   On Windows:
+#     Issue the command: gem install ibm_db
+#     If prompted, select the mswin32 option
+#
+# For more details on the installation refer to http://rubyforge.org/docman/view.php/2361/7682/IBM_DB_GEM.pdf
+#
+# For more details on the connection parameters below refer to:
+#   http://rubyibm.rubyforge.org/docs/adapter/0.9.0/rdoc/classes/ActiveRecord/ConnectionAdapters/IBM_DBAdapter.html
+
+development:
+  adapter:     ibm_db
+  username:    db2inst1
+  password:
+  database:    <%= app_name[0,4] %>_dev
+  #schema:      db2inst1
+  #host:        localhost
+  #port:        50000
+  #account:     my_account
+  #app_user:    my_app_user
+  #application: my_application
+  #workstation: my_workstation
+
+test:
+  adapter:     ibm_db
+  username:    db2inst1
+  password:
+  database:    <%= app_name[0,4] %>_tst
+  #schema:      db2inst1
+  #host:        localhost
+  #port:        50000
+  #account:     my_account
+  #app_user:    my_app_user
+  #application: my_application
+  #workstation: my_workstation
+
+production:
+  adapter:     ibm_db
+  username:    db2inst1
+  password:
+  database:    <%= app_name[0,4] %>_prd
+  #schema:      db2inst1
+  #host:        localhost
+  #port:        50000
+  #account:     my_account
+  #app_user:    my_app_user
+  #application: my_application
+  #workstation: my_workstation
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 9849948339a69b5c157b2a8371e0daabe52a4bc4..acd3dc8c8cb07f39533e26d6b3fe72ac172026e5 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -5,7 +5,7 @@ class AppGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
-  DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase)
+  DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db)
   DEFAULT_DATABASE = 'sqlite3'
 
   default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),