diff --git a/Cabal/Distribution/Simple/Configure.hs b/Cabal/Distribution/Simple/Configure.hs
index 1a65b2aa7bbf9a56db24f1b8d8dfdeaa480ef6bf..56ab85bf81d5e28a9fe9bebf631523240d1ce8dc 100644
--- a/Cabal/Distribution/Simple/Configure.hs
+++ b/Cabal/Distribution/Simple/Configure.hs
@@ -302,13 +302,6 @@ configure (pkg_descr0, pbi) cfg
 
         setupMessage verbosity "Configuring" (packageId pkg_descr0)
 
-        unless (configProfExe cfg == NoFlag) $ do
-          let enable | fromFlag (configProfExe cfg) = "enable"
-                     | otherwise = "disable"
-          warn verbosity
-            ("The flag --" ++ enable ++ "-executable-profiling is deprecated. "
-             ++ "Please use --" ++ enable ++ "-profiling instead.")
-
         unless (configLibCoverage cfg == NoFlag) $ do
           let enable | fromFlag (configLibCoverage cfg) = "enable"
                      | otherwise = "disable"
@@ -635,8 +628,7 @@ configure (pkg_descr0, pbi) cfg
             ++ "is not being built. Linking will fail if any executables "
             ++ "depend on the library."
 
-        let withProf_ = fromFlagOrDefault False (configProf cfg)
-            withProfExe_ = fromFlagOrDefault withProf_ $ configProfExe cfg
+        let withProfExe_ = fromFlagOrDefault False $ configProfExe cfg
             withProfLib_ = fromFlagOrDefault withProfExe_ $ configProfLib cfg
         when (withProfExe_ && not withProfLib_) $ warn verbosity $
                "Executables will be built with profiling, but library "
diff --git a/Cabal/Distribution/Simple/Setup.hs b/Cabal/Distribution/Simple/Setup.hs
index 4ddeb112e05f8388b7e15c2b118b3310c02e6f88..9918bc12a6ac00aad5d49de3244cf1936adc2829 100644
--- a/Cabal/Distribution/Simple/Setup.hs
+++ b/Cabal/Distribution/Simple/Setup.hs
@@ -287,8 +287,6 @@ data ConfigFlags = ConfigFlags {
                                           -- executables.
     configProfExe       :: Flag Bool,     -- ^Enable profiling in the
                                           -- executables.
-    configProf          :: Flag Bool,     -- ^Enable profiling in the library
-                                          -- and executables.
     configConfigureArgs :: [String],      -- ^Extra arguments to @configure@
     configOptimization  :: Flag OptimisationLevel,  -- ^Enable optimization.
     configProgPrefix    :: Flag PathTemplate, -- ^Installed executable prefix.
@@ -344,7 +342,6 @@ defaultConfigFlags progConf = emptyConfigFlags {
     configSharedLib    = NoFlag,
     configDynExe       = Flag False,
     configProfExe      = NoFlag,
-    configProf         = NoFlag,
     configOptimization = Flag NormalOptimisation,
     configProgPrefix   = Flag (toPathTemplate ""),
     configProgSuffix   = Flag (toPathTemplate ""),
@@ -458,7 +455,7 @@ configureOptions showOrParseArgs =
 
       ,option "" ["profiling"]
          "Executable profiling (requires library profiling)"
-         configProf (\v flags -> flags { configProf = v })
+         configProfExe (\v flags -> flags { configProfLib = v, configProfExe = v })
          (boolOpt [] [])
 
       ,option "" ["executable-profiling"]
@@ -731,7 +728,6 @@ instance Monoid ConfigFlags where
     configSharedLib     = mempty,
     configDynExe        = mempty,
     configProfExe       = mempty,
-    configProf          = mempty,
     configConfigureArgs = mempty,
     configOptimization  = mempty,
     configProgPrefix    = mempty,
@@ -774,7 +770,6 @@ instance Monoid ConfigFlags where
     configSharedLib     = combine configSharedLib,
     configDynExe        = combine configDynExe,
     configProfExe       = combine configProfExe,
-    configProf          = combine configProf,
     configConfigureArgs = combine configConfigureArgs,
     configOptimization  = combine configOptimization,
     configProgPrefix    = combine configProgPrefix,
diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs
index 78219f841768a3b09009f19d8fca63c9791a6339..315c05efe4a3848aff1690156a17262e25506cc6 100644
--- a/cabal-install/Distribution/Client/Config.hs
+++ b/cabal-install/Distribution/Client/Config.hs
@@ -255,7 +255,6 @@ instance Monoid SavedConfig where
         configHcPkg               = combine configHcPkg,
         configVanillaLib          = combine configVanillaLib,
         configProfLib             = combine configProfLib,
-        configProf                = combine configProf,
         configSharedLib           = combine configSharedLib,
         configDynExe              = combine configDynExe,
         configProfExe             = combine configProfExe,
diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index 9da8aaac4ad2e5273f96101f519cb23266b805e2..dee71789d3049d76da968cf66b3b8c227c563a9e 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -385,10 +385,8 @@ filterConfigureFlags flags cabalLibVersion
     -- Cabal < 1.21.1 doesn't know about 'enable-profiling'
     flags_1_20_0 =
       flags_latest { configRelocatable = NoFlag
-                   , configProf = NoFlag
-                   , configProfExe = configProf flags
-                   , configProfLib =
-                     mappend (configProf flags) (configProfLib flags)
+                   , configProfExe = configProfExe flags
+                   , configProfLib = configProfLib flags
                    , configCoverage = NoFlag
                    , configLibCoverage = configCoverage flags
                    }