diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..818b92a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/Firebird-3.0.5.33220-0.tar.bz2
diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch
index 1f556e0..735e3b9 100644
--- a/cloop-honour-build-flags.patch
+++ b/cloop-honour-build-flags.patch
@@ -6,8 +6,8 @@ Forwarded: no
 +++ b/extern/cloop/Makefile
 @@ -6,7 +6,7 @@ TARGET	:= release
  
- CC	:= gcc
- CXX	:= g++
+ CC	:= $(CC)
+ CXX	:= $(CXX)
 -LD	:= $(CXX)
 +LD	:= $(CXX) $(LDFLAGS)
  
diff --git a/firebird.spec b/firebird.spec
index 699f9b2..89d350d 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,4 +1,4 @@
-%global         upversion 3.0.4.33054
+%global         upversion 3.0.5.33220
 %global         pkgversion Firebird-%{upversion}-0
 
 %global         major 3.0
@@ -12,7 +12,7 @@ Summary:        SQL relational database management system
 License:        Interbase
 URL:            http://www.firebirdsql.org/
 
-Source0:        https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/%{pkgversion}.tar.bz2
+Source0:        https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/%{pkgversion}.tar.bz2
 Source1:        firebird-logrotate
 Source2:        README.Fedora
 Source3:        firebird-superserver.service
@@ -369,6 +369,9 @@ fi
 
 
 %changelog
+* Mon Jan 20 2020 Philippe Makowski <makowski@fedoraproject.org> - 3.0.5.33220-1
+- new upstream release fix #1786885
+
 * Wed Sep 18 2019 Philippe Makowski <makowski@fedoraproject.org> - 3.0.4.33054-1
 - new upstream release
 
diff --git a/no-copy-from-icu.patch b/no-copy-from-icu.patch
index ca26688..94c2b80 100644
--- a/no-copy-from-icu.patch
+++ b/no-copy-from-icu.patch
@@ -3,7 +3,7 @@ Author: Damyan Ivanov <dmn@debian.org>
 
 --- a/src/isql/isql.epp
 +++ b/src/isql/isql.epp
-@@ -168,34 +168,6 @@ const char* UNKNOWN = "*unknown*";
+@@ -167,34 +167,6 @@ const char* UNKNOWN = "*unknown*";
  
  namespace IcuUtil
  {
@@ -40,13 +40,12 @@ Author: Damyan Ivanov <dmn@debian.org>
  	{
 --- a/builds/posix/Makefile.in
 +++ b/builds/posix/Makefile.in
-@@ -476,7 +476,8 @@ $(GSTAT):		$(GSTAT_Objects) $(COMMON_LIB
+@@ -481,7 +481,7 @@ $(GSTAT):		$(GSTAT_Objects) $(COMMON_LIB
  isql:			$(ISQL)
  
  $(ISQL):		$(ISQL_Objects) $(COMMON_LIB)
--	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS)
-+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) \
-+	    $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS)
+-	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
++	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS) $(call LINK_DARWIN_RPATH,..)
  
  nbackup:		$(NBACKUP)
  
diff --git a/sources b/sources
index 5e9598a..5d5ee07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Firebird-3.0.4.33054-0.tar.bz2) = a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
+SHA512 (Firebird-3.0.5.33220-0.tar.bz2) = 67120c54f563cac84408cb50f0f8ea80755342527a441552a975925926ea263937914bce69474f12cf82e004c0f804297fa714aaba4200685f4bff1e47b4df11