diff --git a/README.md b/README.md
index ca526d9c0..6a1dc7f92 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 ###the iconic font designed for Bootstrap
 
 Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
-maintained by [Dave Gandy](http://twitter.com/byscuits). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
+maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 
 Get started at http://fontawesome.io!
 
@@ -42,7 +42,7 @@ For more information on SemVer, please visit http://semver.org.
 
 ##Author
 - Email: dave@fontawesome.io
-- Twitter: http://twitter.com/byscuits
+- Twitter: http://twitter.com/davegandy
 - GitHub: https://github.com/davegandy
 - Work: Lead Product Designer @ http://kyru.us
 
diff --git a/_config.yml b/_config.yml
index 2a1b914fd..a51b5581f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,7 +29,7 @@ fontawesome:
   author:
     name:         Dave Gandy
     email:        dave@fontawesome.io
-    twitter:      byscuits
+    twitter:      davegandy
     work:
       name:       Kyruus
       url:        http://kyruus.com
diff --git a/composer.json b/composer.json
index b20d5f766..eb86b9710 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
       "name": "Dave Gandy",
       "email": "dave@fontawesome.io",
       "role": "Developer",
-      "homepage": "http://twitter.com/byscuits"
+      "homepage": "http://twitter.com/davegandy"
     }
   ],
   "extra": {
diff --git a/css/font-awesome-ie7.css b/css/font-awesome-ie7.css
index 507ebeb3d..17f07766c 100644
--- a/css/font-awesome-ie7.css
+++ b/css/font-awesome-ie7.css
@@ -20,7 +20,7 @@
  *  Author - Dave Gandy
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/byscuits
+ *  Twitter: http://twitter.com/davegandy
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 .icon-large {
diff --git a/css/font-awesome.css b/css/font-awesome.css
index 30a96b22b..7ede1828a 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -20,7 +20,7 @@
  *  Author - Dave Gandy
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/byscuits
+ *  Twitter: http://twitter.com/davegandy
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 /* FONT PATH
diff --git a/less/font-awesome-ie7.less b/less/font-awesome-ie7.less
index 269ab5f81..6675c4989 100644
--- a/less/font-awesome-ie7.less
+++ b/less/font-awesome-ie7.less
@@ -20,7 +20,7 @@
  *  Author - Dave Gandy
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/byscuits
+ *  Twitter: http://twitter.com/davegandy
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 
diff --git a/less/font-awesome.less b/less/font-awesome.less
index 68376992c..0f454612b 100644
--- a/less/font-awesome.less
+++ b/less/font-awesome.less
@@ -20,7 +20,7 @@
  *  Author - Dave Gandy
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/byscuits
+ *  Twitter: http://twitter.com/davegandy
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 
diff --git a/package.json b/package.json
index 99b185176..c25c3322e 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "author": {
     "name": "Dave Gandy",
     "email": "dave@fontawesome.io",
-    "web": "http://twitter.com/byscuits"
+    "web": "http://twitter.com/davegandy"
   },
   "repository": {
     "type": "git",
diff --git a/scss/font-awesome-ie7.scss b/scss/font-awesome-ie7.scss
index 223e5f4b8..0e236f61e 100644
--- a/scss/font-awesome-ie7.scss
+++ b/scss/font-awesome-ie7.scss
@@ -20,7 +20,7 @@
  *  Author - Dave Gandy
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/byscuits
+ *  Twitter: http://twitter.com/davegandy
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 
diff --git a/scss/font-awesome.scss b/scss/font-awesome.scss
index b1f54516c..e5903d856 100644
--- a/scss/font-awesome.scss
+++ b/scss/font-awesome.scss
@@ -20,7 +20,7 @@
  *  Author - Dave Gandy
  *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/byscuits
+ *  Twitter: http://twitter.com/davegandy
  *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 
diff --git a/src/_includes/footer.html b/src/_includes/footer.html
index af80db1a2..186b1524d 100644
--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -3,7 +3,7 @@
     <div>
       <i class="icon-flag"></i> Font Awesome {{ site.fontawesome.version }}
       <span class="hidden-phone">&middot;</span><br class="visible-phone">
-      Created and Maintained by <a href="http://twitter.com/byscuits">Dave Gandy</a>
+      Created and Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
     </div>
     <div>
       Font Awesome licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>