diff --git a/configure b/configure
index 85663737e5..83e07fdcc2 100755
--- a/configure
+++ b/configure
@@ -1285,6 +1285,7 @@ enable_statusbar
 enable_taskbaricon
 enable_tbarnative
 enable_textctrl
+enable_timepick
 enable_tipwindow
 enable_togglebtn
 enable_toolbar
@@ -10905,23 +10906,23 @@ fi
               fi
           fi
 
-          # Check whether --enable-datepick was given.
-if test "${enable_datepick+set}" = set; then :
-  enableval=$enable_datepick;
+          # Check whether --enable-timepick was given.
+if test "${enable_timepick+set}" = set; then :
+  enableval=$enable_timepick;
                           if test "$enableval" = yes; then
-                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=yes'
+                            wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=yes'
                           else
-                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=no'
+                            wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=no'
                           fi
 
 else
 
-                          wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}"
+                          wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_datepick"
+          eval "$wx_cv_use_timepick"
 
 
           enablestring=
diff --git a/configure.in b/configure.in
index 91a36fedd6..0678a9b1d6 100644
--- a/configure.in
+++ b/configure.in
@@ -952,7 +952,7 @@ WX_ARG_FEATURE(statusbar,   [  --enable-statusbar      use wxStatusBar class], w
 WX_ARG_FEATURE(taskbaricon, [  --enable-taskbaricon    use wxTaskBarIcon class], wxUSE_TASKBARICON)
 WX_ARG_FEATURE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_FEATURE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
-WX_ARG_FEATURE(datepick,    [  --enable-timepick       use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
+WX_ARG_FEATURE(timepick,    [  --enable-timepick       use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
 WX_ARG_FEATURE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
 WX_ARG_FEATURE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
 WX_ARG_FEATURE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)