diff --git a/media-gfx/freecad/freecad-1.0.1-r1.ebuild b/media-gfx/freecad/freecad-1.0.1-r2.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-1.0.1-r1.ebuild
rename to media-gfx/freecad/freecad-1.0.1-r2.ebuild
index f23883bebe06c..b08dd0f7b53c5 100644
--- a/media-gfx/freecad/freecad-1.0.1-r1.ebuild
+++ b/media-gfx/freecad/freecad-1.0.1-r2.ebuild
@@ -534,7 +534,10 @@ src_install() {
 		_EOF_
 	fi
 	dosym -r "/usr/$(get_libdir)/${PN}/bin/FreeCADCmd" "/usr/bin/FreeCADCmd"
-	dosym -r "/usr/$(get_libdir)/${PN}/bin/freecad-thumbnailer" "/usr/bin/freecad-thumbnailer"
+
+	if [[ -f src/Tools/freecad-thumbnailer ]]; then
+		dobin src/Tools/freecad-thumbnailer
+	fi
 
 	for dir in share/{applications,icons,metainfo,mime,pixmaps,thumbnailers}; do
 		mv "${ED}/usr/$(get_libdir)/${PN}/${dir}" "${ED}/usr/share/" || die "mv failed"
diff --git a/media-gfx/freecad/freecad-1.0.2-r1.ebuild b/media-gfx/freecad/freecad-1.0.2-r2.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-1.0.2-r1.ebuild
rename to media-gfx/freecad/freecad-1.0.2-r2.ebuild
index 8df6d990a8743..9ea0158ba7da5 100644
--- a/media-gfx/freecad/freecad-1.0.2-r1.ebuild
+++ b/media-gfx/freecad/freecad-1.0.2-r2.ebuild
@@ -547,7 +547,10 @@ src_install() {
 		_EOF_
 	fi
 	dosym -r "/usr/$(get_libdir)/${PN}/bin/FreeCADCmd" "/usr/bin/FreeCADCmd"
-	dosym -r "/usr/$(get_libdir)/${PN}/bin/freecad-thumbnailer" "/usr/bin/freecad-thumbnailer"
+
+	if [[ -f src/Tools/freecad-thumbnailer ]]; then
+		dobin src/Tools/freecad-thumbnailer
+	fi
 
 	for dir in share/{applications,icons,metainfo,mime,pixmaps,thumbnailers}; do
 		mv "${ED}/usr/$(get_libdir)/${PN}/${dir}" "${ED}/usr/share/" || die "mv failed"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 674f1507421a2..5b981c0aa41cb 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -548,7 +548,12 @@ src_install() {
 		_EOF_
 	fi
 	dosym -r "/usr/$(get_libdir)/${PN}/bin/FreeCADCmd" "/usr/bin/FreeCADCmd"
-	dosym -r "/usr/$(get_libdir)/${PN}/bin/freecad-thumbnailer" "/usr/bin/freecad-thumbnailer"
+
+	if [[ -f src/Tools/freecad-thumbnailer ]]; then
+		dobin src/Tools/freecad-thumbnailer
+	else
+		dosym -r "/usr/$(get_libdir)/${PN}/bin/freecad-thumbnailer" "/usr/bin/freecad-thumbnailer"
+	fi
 
 	for dir in share/{applications,icons,metainfo,mime,pixmaps,thumbnailers}; do
 		mv "${ED}/usr/$(get_libdir)/${PN}/${dir}" "${ED}/usr/share/" || die "mv failed"