diff --git a/emacs/.emacs.d/org-templates/.dir-locals b/emacs/.emacs.d/org-templates/.dir-locals
new file mode 100644
index 0000000..f88a6f9
--- /dev/null
+++ b/emacs/.emacs.d/org-templates/.dir-locals
@@ -0,0 +1,2 @@
+((nil
+  (require-final-newline . nil)))
diff --git a/emacs/.emacs.d/org-templates/lookat-bookmarks.org b/emacs/.emacs.d/org-templates/lookat-bookmarks.org
new file mode 100644
index 0000000..32b4c91
--- /dev/null
+++ b/emacs/.emacs.d/org-templates/lookat-bookmarks.org
@@ -0,0 +1,5 @@
+
+* TODO %h                                                   :bookmark:
+  %U
+  %description
+  %a
diff --git a/emacs/.emacs.d/org-templates/podcast.org b/emacs/.emacs.d/org-templates/podcast.org
new file mode 100644
index 0000000..6d0ae73
--- /dev/null
+++ b/emacs/.emacs.d/org-templates/podcast.org
@@ -0,0 +1,5 @@
+
+* LISTEN %h
+  SCHEDULED: %T
+  %description
+  %a
diff --git a/emacs/.emacs.d/site-lisp/org-init.el b/emacs/.emacs.d/site-lisp/org-init.el
index 8a42e8d..0e23c48 100644
--- a/emacs/.emacs.d/site-lisp/org-init.el
+++ b/emacs/.emacs.d/site-lisp/org-init.el
@@ -215,30 +215,16 @@ predecessor if there is a non-DONE sibling defined before it."
                   oni:org-scuttle-feed-username
                   oni:org-scuttle-feed-password)
          "~/documents/org/tasks" "Inbox"
-         :template "
-* TODO %h  :bookmark:
-  %U
-  %description
-  %a
-")
+         :template ,(oni:read-org-template "lookat-bookmarks"))
         ("Linux voice podcast"
          "http://www.linuxvoice.com/podcast_ogg.rss"
          "~/documents/org/podcast.org" "Linux Voice"
-         :template "
-* LISTEN %h
-  SCHEDULED: %T
-  %description
-  %a
-")
+         :template ,(oni:read-org-template "podcast"))
         ("Open Metalcast"
          "http://feeds.feedburner.com/openmetalcast/ogg"
          "~/documents/org/podcast.org" "Open Metalcast"
-         :template "
-* LISTEN %h
-  SCHEDULED: %T
-  %description
-  %a
-")))
+         :template ,(oni:read-org-template "podcast"))))
+
 (setq org-fontify-done-headline t)
 (setq org-hide-emphasis-markers t)
 (setq org-outline-path-complete-in-steps t)