diff --git a/radiotool/algorithms/retarget.py b/radiotool/algorithms/retarget.py
index <HASH>..<HASH> 100644
--- a/radiotool/algorithms/retarget.py
+++ b/radiotool/algorithms/retarget.py
@@ -258,8 +258,8 @@ def retarget(song, duration, music_labels=None, out_labels=None, out_penalty=Non
             first_pause = i
             break
 
-    max_beats = 200
-    min_beats = 40
+    max_beats = int(60. / song.analysis["avg_beat_duration"])  # ~ 1 minute
+    min_beats = int(30. / song.analysis["avg_beat_duration"])   # ~ 30 seconds
     max_beats = min(max_beats, penalty.shape[1])
 
     tc2 = N.nan_to_num(trans_cost)
change defaults for max and min music beats