diff --git a/Makefile b/Makefile
index 0ec1e20d0..ce419c1cc 100644
--- a/Makefile
+++ b/Makefile
@@ -158,8 +158,7 @@ LISPF      = 	org.el			\
 		ob-js.el		\
 		ob-scheme.el		\
 		ob-lilypond.el		\
-		ob-java.el		\
-		ob-fortran.el
+		ob-java.el
 
 LISPFILES0  = $(LISPF:%=lisp/%)
 LISPFILES   = $(LISPFILES0) lisp/org-install.el
diff --git a/lisp/ob-fortran.el b/contrib/babel/langs/ob-fortran.el
similarity index 91%
rename from lisp/ob-fortran.el
rename to contrib/babel/langs/ob-fortran.el
index 4c366cc79..f2f5cb21c 100644
--- a/lisp/ob-fortran.el
+++ b/contrib/babel/langs/ob-fortran.el
@@ -1,31 +1,30 @@
 ;;; ob-fortran.el --- org-babel functions for fortran
 
-;; Copyright (C) 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2011 Sergey Litvinov, Eric Schulte
 
-;; Author: Sergey Litvinov (based on ob-C.el by Eric Schulte)
+;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
 ;; Keywords: literate programming, reproducible research, fortran
 ;; Homepage: http://orgmode.org
 ;; Version: 7.6
 
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-
+;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;; Org-Babel support for evaluating fortran code.
-;;
 
 ;;; Code:
 (require 'ob)
@@ -160,6 +159,4 @@ of the same value."
 
 (provide 'ob-fortran)
 
-;; arch-tag: 466c8aa4-b919-462d-b1da-3e147073b56e
-
 ;;; ob-fortran.el ends here
diff --git a/lisp/org.el b/lisp/org.el
index 4e9f2063b..14ed95121 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -164,7 +164,6 @@ requirements) is loaded."
 		 (const :tag "Ditaa" ditaa)
 		 (const :tag "Dot" dot)
 		 (const :tag "Emacs Lisp" emacs-lisp)
-		 (const :tag "Fortran" fortran)
 		 (const :tag "Gnuplot" gnuplot)
 		 (const :tag "Haskell" haskell)
 		 (const :tag "Java" java)