diff --git a/ChangeLog b/ChangeLog
index 8d7a8108e..b0841ba6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ Features
      errors on use of deprecated functions.
 
 Bugfix
+   * Fix handling of symlinks by "make install" (found by Gaël PORTAY).
    * Fix potential NULL pointer dereference (not trigerrable remotely) when
      ssl_write() is called before the handshake is finished (introduced in
      1.3.10) (first reported by Martin Blumenstingl).
diff --git a/Makefile b/Makefile
index f9a4ce24c..441d1f9f2 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ install:
 	cp -r include/polarssl $(DESTDIR)/include
 	
 	mkdir -p $(DESTDIR)/lib
-	cp library/libpolarssl.* library/libmbedtls.* $(DESTDIR)/lib
+	cp -RP library/libpolarssl.* library/libmbedtls.* $(DESTDIR)/lib
 	
 	mkdir -p $(DESTDIR)/bin
 	for p in programs/*/* ; do              \