diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index fdc4493..10af83a 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Nov  4 18:00:35 UTC 2014 - guillaume@opensuse.org
+
+- Disable elf-hack for aarch64
+- Enable EGL for aarch64
+- Limit RAM usage during link for %arm
+- Fix _constraints for ARM
+
+-------------------------------------------------------------------
+Mon Nov  3 11:36:04 UTC 2014 - dmueller@suse.com
+
+- use proper macros for ARM 
+
+-------------------------------------------------------------------
+Mon Nov  3 11:26:23 UTC 2014 - josua.mayer97@gmail.com
+
+- use '--disable-optimize' not only on 32-bit x86, but on 32-bit arm too
+  to fix compiling.
+- pass '-Wl,--no-keep-memory' to linker to reduce required memory during
+  linking on arm.
+
 -------------------------------------------------------------------
 Thu Oct 30 11:31:05 UTC 2014 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 923c415..31d3182 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -300,6 +300,8 @@ export CFLAGS="${CFLAGS} -Os"
 %endif
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
+# Limit RAM usage during link
+export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %ifarch ppc64 ppc64le
 export CFLAGS="$CFLAGS -mminimal-toc"
@@ -319,12 +321,12 @@ ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
 ac_add_options --enable-stdcxx-compat
-%ifarch %ix86
+%ifarch %ix86 %arm
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
 %endif
 %endif
-%ifnarch ppc ppc64 ppc64le
+%ifnarch ppc ppc64 ppc64le aarch64
 ac_add_options --enable-elf-hack
 %endif
 ac_add_options --with-system-nspr
@@ -369,7 +371,7 @@ ac_add_options --disable-neon
 ac_add_options --disable-webrtc
 %endif
 # try to use OpenGL-ES on ARM
-%ifarch %arm
+%ifarch %arm aarch64
 ac_add_options --with-gl-provider=EGL
 %endif
 EOF
diff --git a/_constraints b/_constraints
index d97e39d..df0fca5 100644
--- a/_constraints
+++ b/_constraints
@@ -15,7 +15,7 @@
     </conditions>
     <hardware>
       <memory>
-        <size unit="M">768</size>
+        <size unit="M">2600</size>
       </memory>
     </hardware>
   </overwrite>