diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 4263881fbc45..736851f0c29b 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2018/04/14 07:34:22 adam Exp $
+# $NetBSD: Makefile,v 1.73 2018/07/07 11:57:33 adam Exp $
 
-DISTNAME=	openttd-1.7.1-source
+DISTNAME=	openttd-1.8.0-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	4
 CATEGORIES=	games x11
 MASTER_SITES=	http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index b9448f9d5a24..16692a1f7fa2 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2017/06/28 18:18:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2018/07/07 11:57:33 adam Exp $
 bin/openttd
 man/man6/openttd.6
 share/applications/openttd.desktop
@@ -22,6 +22,7 @@ share/openttd/ai/compat_1.4.nut
 share/openttd/ai/compat_1.5.nut
 share/openttd/ai/compat_1.6.nut
 share/openttd/ai/compat_1.7.nut
+share/openttd/ai/compat_1.8.nut
 share/openttd/baseset/no_music.obm
 share/openttd/baseset/no_sound.obs
 share/openttd/baseset/openttd.grf
@@ -39,6 +40,7 @@ share/openttd/game/compat_1.4.nut
 share/openttd/game/compat_1.5.nut
 share/openttd/game/compat_1.6.nut
 share/openttd/game/compat_1.7.nut
+share/openttd/game/compat_1.8.nut
 share/openttd/lang/afrikaans.lng
 share/openttd/lang/arabic_egypt.lng
 share/openttd/lang/basque.lng
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index e84c3869433f..527d259e7105 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.28 2017/06/28 18:18:36 adam Exp $
+$NetBSD: distinfo,v 1.29 2018/07/07 11:57:33 adam Exp $
 
-SHA1 (openttd-1.7.1-source.tar.xz) = a24a2a33cefd8d192fd4f6584f142a4b9d10338b
-RMD160 (openttd-1.7.1-source.tar.xz) = 7ed0fc3b1c62cdcc11093c3fe3945b7a8fd0f292
-SHA512 (openttd-1.7.1-source.tar.xz) = ac3115538174801dc14f63065408e31ef9f60fe4a695d382bdccdd82c547d36e358c2109031289bd19114810a9db6add2662aa09e868ca40ea87ae500b7bca02
-Size (openttd-1.7.1-source.tar.xz) = 6517328 bytes
+SHA1 (openttd-1.8.0-source.tar.xz) = fd6c90f04c4cbd626751acb9bf8a47a9f2b31520
+RMD160 (openttd-1.8.0-source.tar.xz) = a607e955189561cc980dffc50dec57fc9ea9b9fb
+SHA512 (openttd-1.8.0-source.tar.xz) = a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a
+Size (openttd-1.8.0-source.tar.xz) = 6521016 bytes
 SHA1 (patch-config.lib) = 4d3d7d9cc917163c728a51c17efa7f6b2e100913
 SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1
+SHA1 (patch-src_language.h) = 162b798adb6a78172f2191633f44c7e59506f129
+SHA1 (patch-src_strings.cpp) = 75dd2a6672fa0b49ae724820f899f8b7f9260a56
diff --git a/games/openttd/patches/patch-src_language.h b/games/openttd/patches/patch-src_language.h
new file mode 100644
index 000000000000..6333fef1b567
--- /dev/null
+++ b/games/openttd/patches/patch-src_language.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_language.h,v 1.1 2018/07/07 11:57:34 adam Exp $
+
+Fix for ICU 61.
+https://github.com/OpenTTD/OpenTTD/issues/6690
+
+--- src/language.h.orig	2018-07-07 11:12:28.000000000 +0000
++++ src/language.h
+@@ -105,7 +105,7 @@ extern LanguageList _languages;
+ extern const LanguageMetadata *_current_language;
+ 
+ #ifdef WITH_ICU_SORT
+-extern Collator *_current_collator;
++extern icu::Collator *_current_collator;
+ #endif /* WITH_ICU_SORT */
+ 
+ bool ReadLanguagePack(const LanguageMetadata *lang);
diff --git a/games/openttd/patches/patch-src_strings.cpp b/games/openttd/patches/patch-src_strings.cpp
new file mode 100644
index 000000000000..5e02e19c0b82
--- /dev/null
+++ b/games/openttd/patches/patch-src_strings.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_strings.cpp,v 1.1 2018/07/07 11:57:34 adam Exp $
+
+Fix for ICU 61.
+https://github.com/OpenTTD/OpenTTD/issues/6690
+
+--- src/strings.cpp.orig	2018-07-07 11:13:01.000000000 +0000
++++ src/strings.cpp
+@@ -52,7 +52,7 @@ const LanguageMetadata *_current_languag
+ TextDirection _current_text_dir; ///< Text direction of the currently selected language.
+ 
+ #ifdef WITH_ICU_SORT
+-Collator *_current_collator = NULL;               ///< Collator for the language currently in use.
++icu::Collator *_current_collator = NULL;          ///< Collator for the language currently in use.
+ #endif /* WITH_ICU_SORT */
+ 
+ static uint64 _global_string_params_data[20];     ///< Global array of string parameters. To access, use #SetDParam.
+@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMeta
+ 
+ 	/* Create a collator instance for our current locale. */
+ 	UErrorCode status = U_ZERO_ERROR;
+-	_current_collator = Collator::createInstance(Locale(_current_language->isocode), status);
++	_current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status);
+ 	/* Sort number substrings by their numerical value. */
+ 	if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
+ 	/* Avoid using the collator if it is not correctly set. */