diff --git a/nginx.changes b/nginx.changes
index 200a751..b3b41b2 100644
--- a/nginx.changes
+++ b/nginx.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 25 15:12:27 UTC 2018 - mrostecki@suse.com
+
+- Add nginx-source package
+
 -------------------------------------------------------------------
 Tue May 15 16:51:56 UTC 2018 - crrodriguez@opensuse.org
 
diff --git a/nginx.rpmlintrc b/nginx.rpmlintrc
index c34d40b..5164567 100644
--- a/nginx.rpmlintrc
+++ b/nginx.rpmlintrc
@@ -1,3 +1,5 @@
 # user nginx needs write permissions to /var/log/nginx so nginx is able to reopen the logs
 addFilter("nginx.*: W: suse-logrotate-user-writable-log-dir /var/log/nginx nginx:nginx 0750")
+# nginx sources need to be installed in /usr/src/nginx
+addFilter("nginx.* W: suse-filelist-forbidden-fhs23 /usr/src/nginx")
 
diff --git a/nginx.spec b/nginx.spec
index e06c0e5..dca8cfa 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -84,6 +84,8 @@ Release:        0
 %define nginx_rtmp_version 1.2.1
 %define nginx_rtmp_module_path nginx-rtmp-module-%{nginx_rtmp_version}
 
+%define src_install_dir /usr/src/%{name}
+
 Summary:        A HTTP server and IMAP/POP3 proxy server
 License:        BSD-2-Clause
 Group:          Productivity/Networking/Web/Proxy
@@ -162,6 +164,14 @@ It has been running on many heavily loaded Russian sites for more than two years
 
 This package holds the VIM support for nginx config files.
 
+%package -n nginx-source
+Summary:        The nginx source
+Group:          Development/Sources
+BuildArch:      noarch
+
+%description -n nginx-source
+The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server.
+
 %prep
 %setup -q -n %{pkg_name}-%{version} -a 4 -a 5 -a 6 -a 7
 %patch0 -p1
@@ -294,6 +304,9 @@ chmod a+rx contrib/geo2nginx.pl
 cp -av contrib/geo2nginx.pl contrib/unicode2nginx/ \
   %{buildroot}%{_datadir}/nginx/
 
+mkdir -p %{buildroot}%{src_install_dir}
+tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir}
+
 copydocs() {
   subdir=$1;
   shift;
@@ -412,4 +425,7 @@ copydocs %{nginx_rtmp_module_path} \
 %{vim_data_dir}/indent/nginx.vim
 %{vim_data_dir}/syntax/nginx.vim
 
+%files -n nginx-source
+%{src_install_dir}
+
 %changelog