diff --git a/Changelog.md b/Changelog.md
index 4da94146..f1f02e39 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 **latest**
 - init: added GOOGLE_ANALYTICS_ID configuration option
 - added support for mantis issue tracker
+- fixed log rotation configuration
 
 **7.6.2**
 - gitlab: upgrade to CE v.7.6.2
diff --git a/assets/setup/install b/assets/setup/install
index 277bcc03..0e018c41 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -142,7 +142,7 @@ ${GITLAB_LOG_DIR}/gitlab/*.log {
 EOF
 
 # configure gitlab-shell log rotation
-cat > /etc/logrotate.d/gitlab <<EOF
+cat > /etc/logrotate.d/gitlab-shell <<EOF
 ${GITLAB_LOG_DIR}/gitlab-shell/*.log {
   weekly
   missingok
@@ -155,7 +155,7 @@ ${GITLAB_LOG_DIR}/gitlab-shell/*.log {
 EOF
 
 # configure gitlab vhost log rotation
-cat > /etc/logrotate.d/gitlab <<EOF
+cat > /etc/logrotate.d/gitlab-nginx <<EOF
 ${GITLAB_LOG_DIR}/nginx/*.log {
   weekly
   missingok