diff --git a/doc/ChangeLog b/doc/ChangeLog
index a1792b6cf..67d570991 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -2,6 +2,7 @@
 
 	* org.texi (Conflicts): Document new work-around for windmove.el.
 	(Plain lists): Describe counter start cookies.
+	(External links): Add example for a doi link.
 
 2010-04-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/doc/org.texi b/doc/org.texi
index a9056e194..d36f495e1 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -2806,6 +2806,7 @@ the colon.  The following list shows examples for each link type.
 
 @example
 http://www.astro.uva.nl/~dominik          @r{on the web}
+doi:10.1000/182                           @r{DOI for an electronic resource}
 file:/home/dominik/images/jupiter.jpg     @r{file, absolute path}
 /home/dominik/images/jupiter.jpg          @r{same as above}
 file:papers/last.pdf                      @r{file, relative path}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b57e66b0..3b97d17c8 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-26  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-link-types, org-open-at-point): Add doi links.
+
 	* org-ascii.el (org-export-ascii-preprocess): Remove list
 	startcounter cookies.
 
diff --git a/lisp/org.el b/lisp/org.el
index 9c2f848fa..992050418 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4496,7 +4496,7 @@ The following commands are available:
 
 (defconst org-non-link-chars "]\t\n\r<>")
 (defvar org-link-types '("http" "https" "ftp" "mailto" "file" "news"
-			   "shell" "elisp"))
+			   "shell" "elisp" "doi"))
 (defvar org-link-types-re nil
    "Matches a link that has a url-like prefix like \"http:\"")
 (defvar org-link-re-with-space nil
@@ -8680,6 +8680,11 @@ application the system uses for this file type."
 	  (browse-url (concat type ":" (org-link-escape
 					path org-link-escape-chars-browser))))
 
+	 ((string= type "doi")
+	  (browse-url (concat "http://dx.doi.org/"
+                              (org-link-escape
+                               path org-link-escape-chars-browser))))
+
 	 ((member type '("message"))
 	  (browse-url (concat type ":" path)))