diff --git a/ChangeLog b/ChangeLog
index 8cdd421b..fe90114a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19055,3 +19055,6 @@
 	* Updated ripper profiling code in rdlibrary(1) to be UTF-8 clean.
 2019-08-31 Fred Gleason <fredg@paravelsystems.com>
 	* Refactored 'RDCddbLookup' to use CDDB protocol level 6.
+2019-08-31 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in the Disk Ripper in rdlibrary(1) that allowed
+	data tracks to be ripped.
diff --git a/rdlibrary/disk_ripper.cpp b/rdlibrary/disk_ripper.cpp
index 49198a1b..d3f708cb 100644
--- a/rdlibrary/disk_ripper.cpp
+++ b/rdlibrary/disk_ripper.cpp
@@ -1,8 +1,8 @@
 // disk_ripper.cpp
 //
-// CD Ripper Dialog for Rivendell.
+// CD Disk Ripper Dialog for Rivendell.
 //
-//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2019 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
@@ -904,6 +904,14 @@ void DiskRipper::selectionChangedData()
   while(item!=NULL) {
     int track=item->text(0).toInt();
     if(item->isSelected()) {
+      if(item->text(4)==tr("Data Track")) {
+	rip_setcut_button->setEnabled(false);
+	rip_setall_button->setEnabled(false);
+	rip_setsingle_button->setEnabled(false);
+	rip_cartlabel_button->setEnabled(false);
+	rip_clear_button->setEnabled(true);
+	return;
+      }
       if(item->id()>0) {
 	FocusSelection(item->id());
 	rip_setcut_button->setEnabled(false);
diff --git a/rdlibrary/disk_ripper.h b/rdlibrary/disk_ripper.h
index 822dc8d7..df39b29d 100644
--- a/rdlibrary/disk_ripper.h
+++ b/rdlibrary/disk_ripper.h
@@ -1,8 +1,8 @@
 // disk_ripper.h
 //
-// CD Ripper Dialog for Rivendell
+// CD Disk Ripper Dialog for Rivendell
 //
-//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2019 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