diff --git a/ChangeLog b/ChangeLog
index ff0a25f2..5e5d4008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23684,3 +23684,6 @@
 2022-11-15 David Klann <dklann@broadcasttool.com>
 	* Implemented sorting of the dropbox list in the 'Rivendell
 	Dropbox List' dialog in rdadmin(1).
+2022-11-15 Fred Gleason <fredg@paravelsystems.com>
+	* Applied a PR from Robert Chipperfield that broke waveform
+	generation on ARM architectures.
diff --git a/lib/rdwavepainter.cpp b/lib/rdwavepainter.cpp
index d27beada..efc9711d 100644
--- a/lib/rdwavepainter.cpp
+++ b/lib/rdwavepainter.cpp
@@ -220,8 +220,8 @@ void RDWavePainter::drawWaveByMsecs(int x,int w,int startmsecs,int endmsecs,
 				    int startclip,int endclip)
 {
   drawWaveBySamples(x,w,
-	     (unsigned)((double)startmsecs*(double)wave_sample_rate/1000.0),
-	     (unsigned)((double)endmsecs*(double)wave_sample_rate/1000.0),
+	     (int)((double)startmsecs*(double)wave_sample_rate/1000.0),
+	     (int)((double)endmsecs*(double)wave_sample_rate/1000.0),
 	     gain,channel,color,
 	     (int)((double)startclip*(double)wave_sample_rate/1000.0),
 	     (int)((double)endclip*(double)wave_sample_rate/1000.0));