diff -u b/date_popup/date_popup.js b/date_popup/date_popup.js
--- b/date_popup/date_popup.js
+++ b/date_popup/date_popup.js
@@ -36,7 +36,8 @@
               .replace('H', 'HH')  // 24-hour, leading zero
               .replace('G', 'H')   // 24-hour, no leading zero
               .replace('A', 'p')   // AM/PM
-              .replace('i', 'mm'); // minutes with leading zero
+              .replace('i', 'mm')  // minutes with leading zero
+              .replace('s', 'ss'); // seconds with leading zero
 
             datePopup.settings.startTime = new Date(datePopup.settings.startTime);
             $(this)
@@ -55 +56 @@
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff -u b/date_popup/date_popup.module b/date_popup/date_popup.module
--- b/date_popup/date_popup.module
+++ b/date_popup/date_popup.module
@@ -391,7 +391,7 @@
     '#title' => $element['#date_label_position'] == 'above' ? t('Time') : '',
     '#default_value' => $element['#value']['time'],
     '#id' => $id,
-    '#size' => 10,
+    '#size' => 15,
     '#maxlength' => 10,
     '#attributes' => $element['#attributes'],
     '#parents' => $parents,
@@ -657,7 +657,7 @@
   $wvega_available = date_popup_get_wvega_path();
   $preferred_timepicker = date_popup_get_preferred_timepicker();
 
-  $form['#prefix'] = t('<p>The Date Popup module uses one of two jQuery timepicker plugins. The default timepicker comes with the Date module and is already installed. The other is a dropdown timepicker that must be downloaded separately. If you do not want to use either of the timepickers, you can choose the "None" option below and users will get a regular textfield instead.</p>');
+  $form['#prefix'] = t('<p>The Date Popup module uses one of two jQuery timepicker plugins. The default timepicker comes with the Date module and is already installed. The other is a dropdown timepicker that must be downloaded separately. If you do not want to use either of the timepickers, you can choose the "Manual time entry" option below and users will get a regular textfield instead.</p>');
   $form['date_popup_timepicker'] = array(
     '#type' => 'select',
     '#options' => array(