diff --git a/404.html b/404.html
new file mode 100644
index 0000000..cd8aaaa
--- /dev/null
+++ b/404.html
@@ -0,0 +1,5 @@
+---
+layout: page
+title: Uh oh.
+---
+Looks like I lost that one, sorry. Maybe check the <a href="/blog">archive</a>?
diff --git a/htaccess b/htaccess
new file mode 100644
index 0000000..9b16f69
--- /dev/null
+++ b/htaccess
@@ -0,0 +1,21 @@
+---
+layout: nil
+permalink: .htaccess
+---
+ErrorDocument 404 /404.html
+
+Redirect permanent /james-walker /about/
+
+Redirect permanent /node/feed /atom.xml
+Redirect permanent /rss.xml /atom.xml
+Redirect permanent /topics/drupal/feed /tag/drupal/atom.xml
+
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+
+  RewriteCond %{HTTP_USER_AGENT} !^(FeedBurner|FeedValidator) [NC]
+  RewriteRule ^atom.xml http://feeds.feedburner.com/walkah
+
+  RewriteCond %{HTTP_USER_AGENT} !^(FeedBurner|FeedValidator) [NC]
+  RewriteRule ^tag/drupal/atom.xml http://feeds.feedburner.com/walkah/drupal
+</IfModule>
\ No newline at end of file