diff --git a/OTP-17.5.4.tar.gz b/OTP-17.5.4.tar.gz
new file mode 100644
index 0000000..35119f2
--- /dev/null
+++ b/OTP-17.5.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:992cf57738f56e5ca5cae5fb1f9dcc7f136ac0420bb2f27ad168ae4b7a806e88
+size 33116593
diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..6fd8b9a
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <memory>
+      <size unit="M">3000</size>
+    </memory>
+  </hardware>
+</constraints> 
diff --git a/_service b/_service
new file mode 100644
index 0000000..9088c01
--- /dev/null
+++ b/_service
@@ -0,0 +1,5 @@
+<services>
+	<service name="download_files" mode="disabled">
+		<param name="recompress">no</param>
+	</service>
+</services>
diff --git a/erlang.changes b/erlang.changes
index 5309760..806c617 100644
--- a/erlang.changes
+++ b/erlang.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 28 13:08:20 UTC 2015 - matwey.kornilov@gmail.com
+
+- Update to 17.5.4
+
 -------------------------------------------------------------------
 Tue Apr  7 12:18:26 UTC 2015 - kruber@zib.de
 
diff --git a/erlang.spec b/erlang.spec
index 8d9ec41..2250b1a 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package erlang
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
 
 
 Name:           erlang
-Version:        17.5
+Version:        17.5.4
 Release:        0
 Summary:        General-purpose programming language and runtime environment
 License:        ErlPL-1.1
 Group:          Development/Languages/Other
 Url:            http://www.erlang.org
-Source:         otp_src_%{version}.tar.gz
-Source1:        otp_doc_html_%{version}.tar.gz
-Source2:        otp_doc_man_%{version}.tar.gz
+Source0:        https://github.com/erlang/otp/archive/OTP-%{version}.tar.gz
 Source3:        %{name}-rpmlintrc
 Source4:        epmd.init
 Source5:        erlang.sysconfig
@@ -50,12 +48,18 @@ BuildRequires:  unixODBC-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  Mesa-devel
 BuildRequires:  fdupes
+BuildRequires:  fop
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  krb5-devel
 BuildRequires:  update-alternatives
+%if 0%{?suse_version} >= 1220
+BuildRequires:  xsltproc
+%else
+BuildRequires:  libxslt
+%endif
 Requires:       erlang-epmd
 
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} >= 1315
 BuildRequires:  wxWidgets-devel >= 3
 %else
 %if 0%{?suse_version} >= 1140
@@ -69,8 +73,8 @@ BuildRequires:  wxGTK-devel >= 2.8
 %endif
 
 %if 0%{?suse_version} >=1230
-BuildRequires:  pkgconfig(systemd)
 BuildRequires:  systemd-devel
+BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 %define have_systemd 1 
 %endif
@@ -277,12 +281,13 @@ Requires:       wxGTK >= 2.8
 A Graphics System used to write platform independent user interfaces.
 
 %prep
-%setup -q -n otp_src_%{version}
+%setup -q -n otp-OTP-%{version}
 %patch0 -p1 -b .rpath
 %patch4 -p1
 %patch5 -p1
 cp %{S:9} .
 
+./otp_build autoconf
 # enable dynamic linking for ssl
 sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure
 # Remove shipped zlib sources
@@ -318,12 +323,15 @@ export CXXFLAGS=$CFLAGS
 make %{?_smp_mflags} clean
 # should work up to at least -j8
 make %{?_smp_mflags}
+# to build the docs, just compiled erlang is required
+PATH=$PWD/bin:$PATH make %{?_smp_mflags} docs
 
 %install
 %if 0%{?sles_version} >= 10
     make DESTDIR=%{buildroot} install
+    make DESTDIR=%{buildroot} install-docs
 %else
-    %make_install
+    %make_install install-docs
 %endif
 
 export TOOLS_VERSION=`ls %{buildroot}%{_libdir}/erlang/lib/ |grep ^tools- | sed "s|tools-||"`
@@ -339,8 +347,7 @@ mv %{buildroot}%{_libdir}/erlang/lib/tools-$TOOLS_VERSION/emacs/test.erl.indente
 # doc
 mv README.md README
 mkdir -p erlang_doc
-tar -C erlang_doc -xzf %{SOURCE1}
-tar -C %{buildroot}/%{_libdir}/erlang -xzf %{SOURCE2}
+find %{buildroot}%{_libdir}/erlang -maxdepth 3 -type d -name doc -or -name info | while read S;do D=`echo $S | sed -e 's|%{buildroot}%{_libdir}/erlang|erlang_doc|'`; B=`dirname $D`; mkdir -p $B; mv $S $D; done
 # compress man pages ...
 find %{buildroot}%{_libdir}/erlang/man -type f -exec gzip {} +
 
diff --git a/otp_doc_html_17.5.tar.gz b/otp_doc_html_17.5.tar.gz
deleted file mode 100644
index 1cddcd5..0000000
--- a/otp_doc_html_17.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5
-size 33510258
diff --git a/otp_doc_man_17.5.tar.gz b/otp_doc_man_17.5.tar.gz
deleted file mode 100644
index 44a2ed2..0000000
--- a/otp_doc_man_17.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3
-size 1363320
diff --git a/otp_src_17.5.tar.gz b/otp_src_17.5.tar.gz
deleted file mode 100644
index 5769cd6..0000000
--- a/otp_src_17.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474
-size 67242289