diff --git a/dev-vcs/guitar/guitar-0.3.0~git.recipe b/dev-vcs/guitar/guitar-1.1.1.recipe
similarity index 87%
rename from dev-vcs/guitar/guitar-0.3.0~git.recipe
rename to dev-vcs/guitar/guitar-1.1.1.recipe
index bba2726ad..acddb3429 100644
--- a/dev-vcs/guitar/guitar-0.3.0~git.recipe
+++ b/dev-vcs/guitar/guitar-1.1.1.recipe
@@ -6,15 +6,15 @@ Features:
 * Written in C++
 * Powered by Qt 5"
 HOMEPAGE="https://soramimi.github.io/Guitar/"
-COPYRIGHT="2018 S.Fuchita"
+COPYRIGHT="2020 S.Fuchita"
 LICENSE="GNU GPL v2"
-REVISION="2"
-srcGitRev="915b85727c0ea6a66bd0ac36b327fa91c7e08a91"
-SOURCE_URI="https://github.com/soramimi/Guitar/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ddd9a52e17e5c81e01b84e270038043a7410024a363d57812300585b251f6408"
+REVISION="1"
+SOURCE_URI="https://github.com/soramimi/Guitar/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="9155fc7c8f28972ecf40ad0badc5a519b50a28e92f54e4e6ea2570ec5ecdf957"
 SOURCE_FILENAME="Guitar-$portVersion-$srcGitRev.tar.gz"
-SOURCE_DIR="Guitar-$srcGitRev"
+SOURCE_DIR="Guitar-$portVersion"
 ADDITIONAL_FILES="guitar.rdef.in"
+PATCHES="guitar-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/dev-vcs/guitar/patches/guitar-1.1.1.patchset b/dev-vcs/guitar/patches/guitar-1.1.1.patchset
new file mode 100644
index 000000000..6309be632
--- /dev/null
+++ b/dev-vcs/guitar/patches/guitar-1.1.1.patchset
@@ -0,0 +1,57 @@
+From d546ef47139269493945df46685a41273521d11a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sun, 23 Feb 2020 16:16:16 +0100
+Subject: =?UTF-8?q?Applied=20patch=20from=20upstream:=20fix=20compilation?=
+ =?UTF-8?q?=20problem=0A9c4708ba7a4a40b08b1083ee75b23ad66a411a50?=
+
+
+diff --git a/src/texteditor/AbstractCharacterBasedApplication.cpp b/src/texteditor/AbstractCharacterBasedApplication.cpp
+index cad4cc4..163b2f0 100644
+--- a/src/texteditor/AbstractCharacterBasedApplication.cpp
++++ b/src/texteditor/AbstractCharacterBasedApplication.cpp
+@@ -218,12 +218,12 @@ QString AbstractCharacterBasedApplication::recentlyUsedPath()
+ 	return m->recently_used_path;
+ }
+ 
+-std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen()
++std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::char_screen()
+ {
+ 	return &m->screen;
+ }
+ 
+-const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen() const
++const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::char_screen() const
+ {
+ 	return &m->screen;
+ }
+diff --git a/src/texteditor/AbstractCharacterBasedApplication.h b/src/texteditor/AbstractCharacterBasedApplication.h
+index e7418f9..596d656 100644
+--- a/src/texteditor/AbstractCharacterBasedApplication.h
++++ b/src/texteditor/AbstractCharacterBasedApplication.h
+@@ -233,8 +233,8 @@ protected:
+ 	SelectionAnchor selection_anchor_1;
+ protected:
+ 
+-	std::vector<Character> *screen();
+-	std::vector<Character> const *screen() const;
++	std::vector<Character> *char_screen();
++	std::vector<Character> const *char_screen() const;
+ 	std::vector<uint8_t> *line_flags();
+ 
+ 	void initEditor();
+diff --git a/src/texteditor/TextEditorWidget.cpp b/src/texteditor/TextEditorWidget.cpp
+index a2b23ab..26298a6 100644
+--- a/src/texteditor/TextEditorWidget.cpp
++++ b/src/texteditor/TextEditorWidget.cpp
+@@ -324,7 +324,7 @@ void TextEditorWidget::paintScreen(QPainter *painter)
+ 			text.reserve(w);
+ 			int o = y * w;
+ 			CharAttr charattr;
+-			Character const *line = &screen()->at(o);
++			Character const *line = &char_screen()->at(o);
+ 			int n = 0;
+ 			while (x + n < w) {
+ 				uint32_t c = line[x + n].c;
+-- 
+2.24.1
+