diff --git a/.gitignore b/.gitignore
index 8477df3..d0b1f42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ otp_src_R14A.tar.gz
 /otp-OTP-17.3.4.tar.gz
 /otp-OTP-17.4.tar.gz
 /otp-OTP-18.2.2.tar.gz
+/otp-OTP-18.2.3.tar.gz
diff --git a/erlang.spec b/erlang.spec
index d029675..bc3f5be 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -15,8 +15,8 @@
 %endif
 
 Name:		erlang
-Version:	18.2.2
-Release:	4%{?dist}
+Version:	18.2.3
+Release:	1%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -912,20 +912,24 @@ Erlang mode for XEmacs (source lisp files).
 
 
 %build
+
+# Set up proper cflags/cxxflags first
 %ifarch sparcv9 sparc64
-CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe}
+ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing"
 %else
 
 %ifarch %{ix86}
 # We have to disable optimizations for Intel Atom
 # See https://bugzilla.redhat.com/1240487#c13
-CFLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" CXXFLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe}
+ERL_FLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing"
 %else
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe}
+ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
 %endif
 
 %endif
 
+CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe}
+
 # Remove pre-built BEAM files
 make clean
 
@@ -2230,6 +2234,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \
 
 
 %changelog
+* Tue Feb  9 2016 Peter Lemenkov <lemenkov@gmail.com> - 18.2.3-1
+- Ver. 18.2.3
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 18.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch
index 933787e..3091632 100644
--- a/otp-0006-Do-not-install-erlang-sources.patch
+++ b/otp-0006-Do-not-install-erlang-sources.patch
@@ -472,10 +472,10 @@ index 1c05d45..88f9f62 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
-index 82cda6a..edfebd2 100644
+index 0a4b625..1b1d83d 100644
 --- a/lib/inets/src/inets_app/Makefile
 +++ b/lib/inets/src/inets_app/Makefile
-@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -115,7 +115,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
  	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
diff --git a/sources b/sources
index 7a59318..b3b8f94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49d9ef3ccffc028100e35ff80e7d4d06  otp-OTP-18.2.2.tar.gz
+236741d3893b09cdd1699edd1549db6b  otp-OTP-18.2.3.tar.gz