diff --git a/games-action/oolite/Manifest b/games-action/oolite/Manifest
index 594956e85..c1229087b 100644
--- a/games-action/oolite/Manifest
+++ b/games-action/oolite/Manifest
@@ -1,3 +1,3 @@
 DIST firefox-4.0.source.js-only.tbz 6198554 SHA256 173b8798043612e50fa7618858c3a92d06f1f439d6d336a5700548cc5d75580a SHA512 37c7fc171113a9b8a1c185cf535eff8b38f8bfeb5af282b20642b5c7efa5a85a635db1f5250f041ca2e5b0bbdbb1139af6a8bf16dbbb6ff5609543482cfc6c66 WHIRLPOOL 6fcaecff23c09f917fe7a8c39548a4612b4d9cfd21ca418530d5398bbc2121319b57334bba843cba4d4a6000562a77fdafb21cb7b7b711ee9d568d928ddf82e9
-DIST oolite-1.82.tar.gz 13274541 SHA256 5cb09b2847c43083ae537f069b28d21a7ab21d05aa13845f61065c41c8d77d85 SHA512 24e22d22d755af9e2c7159bdba5df16356d6f4976bbef85488789d2a54622e4490fc1252994006b5bc3ad9cf8c1ff42d731a4eeac8e5378366fa480e0c529673 WHIRLPOOL 7d18e43342b49006619a5ceb9308b128a7bfd42af539d4f1732a6031ba5c0d56c6a30370dc6804d7e57b90d5acb6d1d1a8449e40056b6514691a9ec26cedc579
-DIST oolite-binary-resources-1.82.zip 96756030 SHA256 4230630b390e633d95ff094e756707e97969c3d22b688faffbe4f7282bdf78d5 SHA512 1bacb1e94d9c04491e0d161db35c32f45d7a104241e3257d26d2a510edd7847eae5ea6e0914e37a09084130415cc8c4369795cdfa7ff855c1426f1cb4bafa281 WHIRLPOOL b9721ab607cf6548af99aeed72173ac534f12b2925f9981eefd999ea487e563b5f6f06c6d7e5f1a50d1587356d969f6061040827517945b307cdf059a8f50d8a
+DIST oolite-1.84.tar.gz 13368123 SHA256 0536eda1634142fba77a0251407209923099f5b80bafc443474d7f5e9dfc1d9d SHA512 9a36bb39ed623fd4d549fd460d2c2020b19024bf9387c057e69c8d524c6dd952a1f25aadd483a3c668e41abe92fde3edd0030e61da458ae0a0b2b0332f6e1b98 WHIRLPOOL dc2ab2bc3b119b12fe6e3a41d1de100350e7e3621cbebde4f2cd9003eb816195442590ba4abc1d8be5e2a10994a0e2eb64b2e80e48b134b3f969c872ec0222d4
+DIST oolite-binary-resources-1.84.zip 96756030 SHA256 4230630b390e633d95ff094e756707e97969c3d22b688faffbe4f7282bdf78d5 SHA512 1bacb1e94d9c04491e0d161db35c32f45d7a104241e3257d26d2a510edd7847eae5ea6e0914e37a09084130415cc8c4369795cdfa7ff855c1426f1cb4bafa281 WHIRLPOOL b9721ab607cf6548af99aeed72173ac534f12b2925f9981eefd999ea487e563b5f6f06c6d7e5f1a50d1587356d969f6061040827517945b307cdf059a8f50d8a
diff --git a/games-action/oolite/files/oolite-gentoo.patch b/games-action/oolite/files/oolite-gentoo.patch
index 3219dd674..f92d05bd2 100644
--- a/games-action/oolite/files/oolite-gentoo.patch
+++ b/games-action/oolite/files/oolite-gentoo.patch
@@ -1,28 +1,8 @@
---- GNUmakefile.postamble.orig	2011-03-26 22:43:40.561323731 +0500
-+++ GNUmakefile.postamble	2011-03-26 22:44:51.512436717 +0500
-@@ -5,9 +5,6 @@
- #
- CP_FLAGS                         = -rf
- 
--ifeq ($(debug),yes)
--    EXT                          =.dbg
--endif
-                                  
- ifeq ($(findstring -gnu,$(GNUSTEP_HOST_OS)),-gnu)
-     CP_FLAGS                     += -u
-@@ -39,9 +36,6 @@
- endif
- 	$(CP) $(CP_FLAGS) src/Cocoa/Info-Oolite.plist $(PROGDIR)/Resources/Info-gnustep.plist
- 	$(CP) $(CP_FLAGS) $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
--ifeq ($(debug),no)
--	$(STRIP) $(PROGDIR)/$(DEST_BIN)
--endif
- ifeq ($(GNUSTEP_HOST_OS),mingw32)
-     ifeq ($(GNUSTEP_HOST_CPU),x86_64)
-                 $(CP) $(CP_FLAGS) deps/Windows-deps/x86_64/DLLs/*.dll $(PROGDIR)
---- GNUmakefile.orig	2014-12-27 01:47:00.718556710 +0500
-+++ GNUmakefile	2014-12-27 02:01:34.797497722 +0500
-@@ -149,9 +149,7 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 95b4b28..4a700ea 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -153,9 +153,7 @@ oolite_C_FILES = \
      legacy_random.c \
      strlcpy.c \
      OOTCPStreamDecoder.c \
@@ -33,3 +13,31 @@
  
  
  OOLITE_DEBUG_FILES = \
+diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble
+index 5d97459..f09ca5b 100644
+--- a/GNUmakefile.postamble
++++ b/GNUmakefile.postamble
+@@ -4,10 +4,6 @@
+ # to live (Contents/Resources)
+ #
+ CP_FLAGS                         = -rf
+-
+-ifeq ($(debug),yes)
+-    EXT                          =.dbg
+-endif
+                                  
+ ifeq ($(findstring -gnu,$(GNUSTEP_HOST_OS)),-gnu)
+     CP_FLAGS                     += -u
+diff --git a/Makefile b/Makefile
+index 5d93c57..8af1d91 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@ debug: $(DEPS_DBG)
+ 
+ .PHONY: release
+ release: $(DEPS)
+-	$(MAKE) -f GNUmakefile debug=no strip=yes
++	$(MAKE) -f GNUmakefile debug=no strip=no
+ 	mkdir -p AddOns && rm -rf AddOns/Basic-debug.oxp && cp -rf DebugOXP/Debug.oxp AddOns/Basic-debug.oxp
+ 
+ .PHONY: release-deployment
diff --git a/games-action/oolite/oolite-1.82.ebuild b/games-action/oolite/oolite-1.84.ebuild
similarity index 98%
rename from games-action/oolite/oolite-1.82.ebuild
rename to games-action/oolite/oolite-1.84.ebuild
index 0d65ae9f1..af39fc8ec 100644
--- a/games-action/oolite/oolite-1.82.ebuild
+++ b/games-action/oolite/oolite-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/profiles/base/package.keywords/calculate b/profiles/base/package.keywords/calculate
index 31e3fe00b..4e2167bcb 100644
--- a/profiles/base/package.keywords/calculate
+++ b/profiles/base/package.keywords/calculate
@@ -1,7 +1,7 @@
 # from the overlay
 ~app-crypt/shim-signed-0.2 amd64 x86
 ~dev-python/soaplib-1.0.0 amd64 x86
-~games-action/oolite-1.82 amd64 x86
+~games-action/oolite-1.84 amd64 x86
 ~games-util/steam-launcher-1.0.0.51 amd64 x86
 ~mate-base/mdm-2.0.5 amd64 x86
 ~net-misc/modem-manager-gui-0.0.18 amd64 x86