diff --git a/.gitignore b/.gitignore
index 91874c948..bc4d9713c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,48 @@
-/.box_dump/
-/requirement-checker/.box_dump/
-/box
-/*.phar
-/*.phar.sig
-/box.json
-/bin/
 !/bin/box
 !/bin/box.bat
 !/bin/generate_default_stub
-/dist/
+!/fixtures/check-requirements/*/expected-output-*-dist
+!/fixtures/php-settings-checker/create-expected-output
+!/fixtures/php-settings-checker/index.php
+!/fixtures/php-settings-checker/output-*
+!/requirement-checker/bin/check-requirments.php
+/*.phar
+/*.phar.sig
+/.box_dump/
+/.php-cs-fixer.cache
+/.php_cs.cache
+/.phpcs-cache
+/.phpunit*
+/.requirement-checker/
 /Dockerfile*
-/fixtures/default_stub.php
+/bin/
+/box
+/box.json
+/dist/
 /fixtures/**/*/vendor/
 /fixtures/build/dir010/*.phar
 /fixtures/build/dir011/*.phar
 /fixtures/build/dir011/*output
 /fixtures/build/dir011/phar-Y.php
-/fixtures/build/dir012/bin/console.phar
 /fixtures/build/dir012/actual-output
+/fixtures/build/dir012/bin/console.phar
 /fixtures/build/dir012/expected-output
+/fixtures/check-requirements/*/*.phar
 /fixtures/check-requirements/*/actual-output
 /fixtures/check-requirements/*/expected-output-*
-!/fixtures/check-requirements/*/expected-output-*-dist
-/fixtures/check-requirements/*/*.phar
+/fixtures/default_stub.php
 /fixtures/php-settings-checker/*
-!/fixtures/php-settings-checker/index.php
-!/fixtures/php-settings-checker/output-*
 /fixtures/php-settings-checker/output-xdebug-enabled
-!/fixtures/php-settings-checker/create-expected-output
-/.phpunit*
-/.requirement-checker/
-/requirement-checker/bin/*
-!/requirement-checker/bin/check-requirments.php
-/requirement-checker/actual_terminal_diff
+/phpcs.xml
+/phpunit.xml
 /requirement-checker/.box/
-/requirement-checker/vendor/
+/requirement-checker/.box_dump/
 /requirement-checker/.phpunit*
-/vendor/
+/requirement-checker/actual_terminal_diff
+/requirement-checker/bin/*
+/requirement-checker/vendor/
+/site/
 /vendor-bin/*/composer.lock
 /vendor-bin/*/vendor/
-/.php_cs.cache
-/.phpcs-cache
-/.php-cs-fixer.cache
-/phpunit.xml
-/phpcs.xml
+/vendor/
 /website/
-/site/
diff --git a/Makefile b/Makefile
index 25f01673a..b47e6141c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ clean:
 
 .PHONY: cs
 cs:	 ## Fixes CS
-cs: composer_normalize php_cs_fixer
+cs: gitignore_sort composer_normalize php_cs_fixer
 
 .PHONY: cs_lint
 cs_lint: ## Checks CS
@@ -55,6 +55,10 @@ composer_normalize: composer.json vendor
 composer_normalize_lint: composer.json vendor
 	composer normalize --dry-run
 
+.PHONY: gitignore_sort
+gitignore_sort:
+	LC_ALL=C sort -u .gitignore -o .gitignore
+
 .PHONY: compile
 compile: 		 ## Compiles the application into the PHAR
 compile: box