diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 29031dcb3..1fe39e550 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D1X-Rebirth Changelog
 --------
 main/piggy.c, main/text.c, main/text.h: Fixed some Piggy- and Text-loading routines for Shareware, Destination Saturn and 1.0 Registered; Full support for End-Briefing on non-registered still missing however
 main/mission.c: Init variables/strings at the beginning of load_mission() to prevent errors if demo content is used
+main/laser.h: If Shareware content is used, fallback to original Smart behaviour since Shareware content has no own definition for Bot-related Smarts
 
 20100303
 --------
diff --git a/main/laser.h b/main/laser.h
index 2e953387f..c3c2a9a24 100644
--- a/main/laser.h
+++ b/main/laser.h
@@ -36,7 +36,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define	SUPER_MECH_MISS	21
 #define	REGULAR_MECH_MISS	22
 #define	SILENT_SPREADFIRE_ID	23
-#define	ROBOT_SMART_HOMING_ID 29
+#define	ROBOT_SMART_HOMING_ID ((N_weapon_types<29)?(PLAYER_SMART_HOMING_ID):(29)) // NOTE: Shareware does not have it's own Smart structure for bots. It was introduced later to make Smart blobs from lvl 7 boss easier to dodge. So if we do not have this type, revert to player's Smart behaviour..
 
 // These are new defines for the value of 'flags' passed to do_laser_firing.
 // The purpose is to collect other flags like QUAD_LASER and Spreadfire_toggle