diff --git a/Distribution/Client/Setup.hs b/Distribution/Client/Setup.hs
--- a/Distribution/Client/Setup.hs
+++ b/Distribution/Client/Setup.hs
@@ -370,7 +370,7 @@
 
 filterConfigureFlags :: ConfigFlags -> Version -> ConfigFlags
 filterConfigureFlags flags cabalLibVersion
-  | cabalLibVersion >= Version [1,21,1] [] = flags_latest
+  | cabalLibVersion >= Version [1,22,0] [] = flags_latest
   -- ^ NB: we expect the latest version to be the most common case.
   | cabalLibVersion <  Version [1,3,10] [] = flags_1_3_10
   | cabalLibVersion <  Version [1,10,0] [] = flags_1_10_0
@@ -379,15 +379,19 @@
   | cabalLibVersion <  Version [1,19,1] [] = flags_1_19_0
   | cabalLibVersion <  Version [1,19,2] [] = flags_1_19_1
   | cabalLibVersion <  Version [1,21,1] [] = flags_1_20_0
+  | cabalLibVersion <  Version [1,22,0] [] = flags_1_21_0
   | otherwise = flags_latest
   where
     -- Cabal >= 1.19.1 uses '--dependency' and does not need '--constraint'.
     flags_latest = flags        { configConstraints = [] }
 
+    -- Cabal < 1.22 doesn't know about '--disable-debug-info'.
+    flags_1_21_0 = flags_latest { configDebugInfo = NoFlag }
+
     -- Cabal < 1.21.1 doesn't know about 'disable-relocatable'
     -- Cabal < 1.21.1 doesn't know about 'enable-profiling'
     flags_1_20_0 =
-      flags_latest { configRelocatable = NoFlag
+      flags_1_21_0 { configRelocatable = NoFlag
                    , configProfExe = configProfExe flags
                    , configProfLib = configProfLib flags
                    , configCoverage = NoFlag
@@ -396,8 +400,10 @@
                    , configProgramPaths =
                      ("cabalConfProf", "/TRUE") `delete` configProgramPaths flags
                    }
-    -- Cabal < 1.19.2 doesn't know about '--exact-configuration'.
-    flags_1_19_1 = flags_1_20_0 { configExactConfiguration = NoFlag }
+    -- Cabal < 1.19.2 doesn't know about '--exact-configuration' and
+    -- '--enable-library-stripping'.
+    flags_1_19_1 = flags_1_20_0 { configExactConfiguration = NoFlag
+                                , configStripLibs = NoFlag }
     -- Cabal < 1.19.1 uses '--constraint' instead of '--dependency'.
     flags_1_19_0 = flags_1_19_1 { configDependencies = []
                                 , configConstraints  = configConstraints flags }
diff --git a/bash-completion/cabal b/bash-completion/cabal
--- a/bash-completion/cabal
+++ b/bash-completion/cabal
@@ -52,7 +52,7 @@
             # using simple regexp and "sandbox" subcommand is printed for each
             # successful substitution.
             "$1" help sandbox |
-            sed -rn '/Flags/q;s/^.* sandbox  *([^ ]*).*/\1/;t p;b;: p;p'
+            sed -rn '/Flags/q;s/^.* cabal sandbox  *([^ ]*).*/\1/;t p;b;: p;p'
             break  # Terminate for loop.
             ;;
         esac
diff --git a/bootstrap.sh b/bootstrap.sh
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -190,7 +190,7 @@
                        # >= 2.0 && < 2.7
 NETWORK_URI_VER="2.6.0.1"; NETWORK_URI_VER_REGEXP="2\.6\."
                        # >= 2.6 && < 2.7
-CABAL_VER="1.22.2.0";  CABAL_VER_REGEXP="1\.22"
+CABAL_VER="1.22.3.0";  CABAL_VER_REGEXP="1\.22"
                        # >= 1.22 && < 1.23
 TRANS_VER="0.4.2.0";   TRANS_VER_REGEXP="0\.[4]\."
                        # >= 0.2.* && < 0.5
diff --git a/cabal-install.cabal b/cabal-install.cabal
--- a/cabal-install.cabal
+++ b/cabal-install.cabal
@@ -1,5 +1,5 @@
 Name:               cabal-install
-Version:            1.22.2.0
+Version:            1.22.3.0
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,4 +1,8 @@
 -*-change-log-*-
+1.22.3.0 Ryan Thomas <ryan@ryant.org> April 2015
+	* Fix bash completion for sandbox subcommands - Fixes #2513 (Mikhail Glushenkov)
+	* filterConfigureFlags: filter more flags (Mikhail Glushenkov)
+
 1.22.2.0 Ryan Thomas <ryan@ryant.org> March 2015
 	* Don't pass '--{en,dis}able-profiling' to old setup exes.
 	* -Wall police