diff --git a/CHANGES b/CHANGES
index 5d0214e956..36a1372e9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,9 +9,9 @@
 	libelf, libevent, libglib2, liblockfile, libmad, libpcap, libupnp,
 	libuuid, ltrace, lua, lzma, mdadm, ncftp, ncurses, netkittelnet,
 	netsnmp, ntfs-3g, openssl, php, python, quagga, radvd, rsync, samba,
-	sawman, shared-mime-info, speech-tools, sqlite, squashfs, syslinux,
-	tcpdump, u-boot, util-linux, valgrind, vsftpd, wipe, wpa-supplicant,
-	xdata_xcursor-themes, zlib
+	sawman, shared-mime-info, speech-tools, sqlite, squashfs, synergy,
+	syslinux, tcpdump, u-boot, util-linux, valgrind, vsftpd, wipe,
+	wpa-supplicant, xdata_xcursor-themes, zlib
 
 	Removed package: mdnsresponder, mpatrol
 
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index fe6a634de1..a2766b13eb 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SYNERGY
 	bool "synergy"
 	depends on BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Synergy lets you easily share a single mouse and
 	  keyboard between multiple computers with different
@@ -8,3 +9,6 @@ config BR2_PACKAGE_SYNERGY
 	  without special hardware.
 
 	  http://synergy2.sourceforge.net/
+
+comment "synergy requires a toolchain with C++ support enabled"
+	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP