diff --git a/debian/changelog b/debian/changelog
index 81359b4..405b4f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@
 
   [ Sylvestre Ledru ]
   * New upsream release
+  * Remove debian/patches/conflicting-type.diff (merged upstream)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 17 Mar 2019 10:23:03 +0100
 
diff --git a/debian/patches/conflicting-type.diff b/debian/patches/conflicting-type.diff
deleted file mode 100644
index 234d633..0000000
--- a/debian/patches/conflicting-type.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-From d844bfeac7d885c45754649a8108adf58f8d0e4b Mon Sep 17 00:00:00 2001
-From: Adrian Cornish <acornish@spotxchange.com>
-Date: Tue, 5 Sep 2017 15:04:53 -0600
-Subject: [PATCH] Some fixes for building on Fedora
-
----
- ruby/print_arch | 6 +++---
- src/languages.h | 2 +-
- src/parser.c    | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: ohcount/ruby/print_arch
-===================================================================
---- ohcount.orig/ruby/print_arch
-+++ ohcount/ruby/print_arch
-@@ -3,13 +3,13 @@ require 'mkmf'
- 
- arch = RbConfig::expand(CONFIG["arch"])
- 
--distro = if File.exist?("/etc/issue")
-+distro = if File.exist?("/etc/os-release")
-   # this is "", "CentOS" or "Ubuntu"
--  `cat /etc/issue`.split.first.downcase
-+  `egrep "^ID=.*" /etc/os-release`.split("=")[1].downcase
- end
- 
- unless ["centos", nil, "ubuntu"].include? distro
--	STDERR.puts "unhandled /etc/issue result: #{distro}"
-+	STDERR.puts "unhandled /etc/os-release result: #{distro}"
- end
- 
- # either <arch> or <arch>_<distro> if distro is non-null
-Index: ohcount/src/languages.h
-===================================================================
---- ohcount.orig/src/languages.h
-+++ ohcount/src/languages.h
-@@ -120,6 +120,6 @@
- 
- // For gperf.
- struct LanguageMap { const char *key; const char *name; const char *nice_name; int category; };
--struct LanguageMap *ohcount_hash_language_from_name(register const char *str, register unsigned int len);
-+struct LanguageMap *ohcount_hash_language_from_name(register const char *str, register size_t len);
- 
- #endif
-Index: ohcount/src/parser.c
-===================================================================
---- ohcount.orig/src/parser.c
-+++ ohcount/src/parser.c
-@@ -7,7 +7,7 @@
- #include "log.h"
- #include "hash/parser_hash.h"
- 
--struct ParserMap * ohcount_hash_parser_from_language (register const char *str, register unsigned int len);
-+struct ParserMap * ohcount_hash_parser_from_language (register const char *str, register size_t len);
- 
- int ohcount_parse(SourceFile *sourcefile, int count,
-                   void (*callback) (const char *, const char *, int, int,
diff --git a/debian/patches/series b/debian/patches/series
index 470fc83..1b02930 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 disabled_test_suite.patch
-conflicting-type.diff
 build-cflags.diff
 fix-buffer-overflow.patch