diff --git a/ChangeLog b/ChangeLog
index bebeae95..ce8bada4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22233,3 +22233,8 @@
 	to be compatible with short date format.
 	* Adjusted layout in the 'Cut Info/Record' dialog in rdlibrary(1)
 	to be compatible with short date format.
+2021-08-12 Fred Gleason <fredg@paravelsystems.com>
+	* Adjusted layout in the 'Edit Log' dialog in rdlogedit(1)
+	to be compatible with short date format.
+	* Adjusted layout in the 'Reports' dialog in rdlogedit(1)
+	to be compatible with short date format.
diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp
index 3b5920fd..6c2d9fac 100644
--- a/rdlogedit/edit_log.cpp
+++ b/rdlogedit/edit_log.cpp
@@ -145,8 +145,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   edit_purgedate_label=new QLabel(tr("Delete on"),this);
   edit_purgedate_label->setFont(labelFont());
   edit_purgedate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-  edit_purgedate_edit=new QDateEdit(this);
-  edit_purgedate_edit->setDisplayFormat("MM/dd/yyyy");
+  edit_purgedate_edit=new RDDateEdit(this);
   edit_purgedate_button=new QPushButton(tr("Select"),this);
   edit_purgedate_button->setFont(buttonFont());
   connect(edit_purgedate_box,SIGNAL(toggled(bool)),
@@ -189,8 +188,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   //
   // Start Date
   //
-  edit_startdate_edit=new QDateEdit(this);
-  edit_startdate_edit->setDisplayFormat("MM/dd/yyyy");
+  edit_startdate_edit=new RDDateEdit(this);
   edit_startdate_label=new QLabel(tr("Start Date:"),this);
   edit_startdate_label->setFont(labelFont());
   edit_startdate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);  
@@ -201,8 +199,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   //
   // End Date
   //
-  edit_enddate_edit=new QDateEdit(this);
-  edit_enddate_edit->setDisplayFormat("MM/dd/yyyy");
+  edit_enddate_edit=new RDDateEdit(this);
   edit_enddate_label=new QLabel(tr("End Date:"),this);
   edit_enddate_label->setFont(labelFont());
   edit_enddate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);  
diff --git a/rdlogedit/edit_log.h b/rdlogedit/edit_log.h
index 335a3d5e..daa5d61e 100644
--- a/rdlogedit/edit_log.h
+++ b/rdlogedit/edit_log.h
@@ -21,15 +21,16 @@
 #ifndef EDIT_LOG_H
 #define EDIT_LOG_H
 
-#include <qgroupbox.h>
-
-#include <rdcart_dialog.h>
-#include <rddialog.h>
-#include <rdloglock.h>
-
+#include <QGroupBox>
 #include <QList>
 #include <QStringList>
 
+
+#include <rdcart_dialog.h>
+#include <rddateedit.h>
+#include <rddialog.h>
+#include <rdloglock.h>
+
 #include "list_reports.h"
 #include "logmodel.h"
 #include "logtableview.h"
@@ -116,8 +117,8 @@ class EditLog : public RDDialog
   QLabel *edit_autorefresh_label;
   QComboBox *edit_autorefresh_box;
   QLineEdit *edit_autorefresh_edit;
-  QDateEdit *edit_startdate_edit;
-  QDateEdit *edit_enddate_edit;
+  RDDateEdit *edit_startdate_edit;
+  RDDateEdit *edit_enddate_edit;
   QLabel *edit_startdate_label;
   QLabel *edit_startdate_box_label;
   QLabel *edit_enddate_box_label;
@@ -163,7 +164,7 @@ class EditLog : public RDDialog
   QLineEdit *edit_endtime_edit;
   QCheckBox *edit_purgedate_box;
   QLabel *edit_purgedate_label;
-  QDateEdit *edit_purgedate_edit;
+  RDDateEdit *edit_purgedate_edit;
   QPushButton *edit_purgedate_button;
   RDLogLock *edit_log_lock;
   QPushButton *edit_renderas_button;
diff --git a/rdlogedit/list_reports.cpp b/rdlogedit/list_reports.cpp
index 4dc5a35e..4a6f5c90 100644
--- a/rdlogedit/list_reports.cpp
+++ b/rdlogedit/list_reports.cpp
@@ -66,8 +66,7 @@ ListReports::ListReports(const QString &logname,const QString &description,
   //
   // Effective Date
   //
-  list_date_edit=new QDateEdit(this);
-  list_date_edit->setDisplayFormat("MM/dd/yyyy");
+  list_date_edit=new RDDateEdit(this);
   list_date_edit->setGeometry(110,34,100,19);
   QLabel *list_date_label=new QLabel(tr("Effective Date:"),this);
   list_date_label->setGeometry(10,34,95,19);
diff --git a/rdlogedit/list_reports.h b/rdlogedit/list_reports.h
index 4ff23808..69a2ef53 100644
--- a/rdlogedit/list_reports.h
+++ b/rdlogedit/list_reports.h
@@ -2,7 +2,7 @@
 //
 // List and Generate Log Reports
 //
-//   (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -21,13 +21,12 @@
 #ifndef LIST_REPORTS_H
 #define LIST_REPORTS_H
 
-#include <qdatetimeedit.h>
-
-#include <qcombobox.h>
+#include <QComboBox>
 
 #include <rddialog.h>
 #include <rdlog.h>
 #include <rdlogmodel.h>
+#include <rddateedit.h>
 
 class ListReports : public RDDialog
 {
@@ -57,7 +56,7 @@ class ListReports : public RDDialog
   QDate list_end_date;
   bool list_auto_refresh;
   RDLogModel *list_model;
-  QDateEdit *list_date_edit;
+  RDDateEdit *list_date_edit;
 };