diff --git a/configure b/configure
index 5f2c39183..83c4c3796 100755
--- a/configure
+++ b/configure
@@ -251,6 +251,7 @@ EXPERIMENT_LIST="
     loop_dering
     implicit_compoundinter_weight
     scatterscan
+    oneshotq
 "
 CONFIG_LIST="
     external_build
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index 9f9cb0e1c..e0675b6cc 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -30,10 +30,11 @@
 #include "vp9/encoder/vp9_lookahead.h"
 
 // Experimental rate control switches
-// #define ONE_SHOT_Q_ESTIMATE 1
-// #define STRICT_ONE_SHOT_Q 1
-// #define DISABLE_RC_LONG_TERM_MEM 1
-
+#if CONFIG_ONESHOTQ
+#define ONE_SHOT_Q_ESTIMATE 1
+#define STRICT_ONE_SHOT_Q 1
+#define DISABLE_RC_LONG_TERM_MEM 1
+#endif
 // #define SPEEDSTATS 1
 #define MIN_GF_INTERVAL             4
 #define DEFAULT_GF_INTERVAL         7