diff --git a/.gitignore b/.gitignore
index db2d7c1..9b3794c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # WP config files
 wp-config.php
 local-config.php
+staging-config.php
 
 # Some of GitHub's recommended ignores
 # https://github.com/github/gitignore/blob/master/Wordpress.gitignore
diff --git a/wp-config-sample.php b/wp-config-sample.php
index ca45650..9f64907 100644
--- a/wp-config-sample.php
+++ b/wp-config-sample.php
@@ -1,11 +1,13 @@
 <?php
 
 /* ============================================================================= 
-   Set database info, but use local-config.php if it exists
+   Define our production settings, but check for local or staging settings first
    ========================================================================== */
 
 if ( file_exists( dirname( __FILE__ ) . '/local-config.php' ) ) {
   include( dirname( __FILE__ ) . '/local-config.php' );
+} elseif ( file_exists( dirname( __FILE__ ) . '/staging-config.php' ) ) {
+  include( dirname( __FILE__ ) . '/staging-config.php' );
 } else {
 
   /*