diff --git a/dev-lang/xamos/patches/xamos-0.29.patchset b/dev-lang/xamos/patches/xamos-0.29.patchset
index d02174797..790ecd57c 100644
--- a/dev-lang/xamos/patches/xamos-0.29.patchset
+++ b/dev-lang/xamos/patches/xamos-0.29.patchset
@@ -1,4 +1,4 @@
-From f02982020ebc693e0f1c6f10523fa54282a42cce Mon Sep 17 00:00:00 2001
+From f7af06ad9b75700c3db04963b98adadddd0d52e0 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 1 May 2014 13:52:57 +0200
 Subject: Fix build on gcc2, add Haiku makefile.
@@ -77,5 +77,40 @@ index 0000000..25e31e6
 +	rm -rf $(EXECUTABLE) *.o
 +
 -- 
-1.8.3.4
+2.21.0
+
+
+From 80480b943ab71310e7bbd02289cd514056406dc8 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 21 Jun 2019 09:17:41 +0200
+Subject: Fix build, add install
+
+
+diff --git a/src/Makefile_haiku b/src/Makefile_haiku
+index 25e31e6..e9cb4b8 100644
+--- a/src/Makefile_haiku
++++ b/src/Makefile_haiku
+@@ -2,6 +2,7 @@ CC=g++
+ 
+ CFLAGS=-c -Wall -pedantic -Wno-deprecated -O3 -D USESDL
+ LDFLAGS=-lSDL_image -lSDL_gfx -lSDL_mixer -ljpeg -lpng -lvorbisfile -lvorbis -logg -lSDL_ttf -lfreetype -lz -lSDL -lGL -lGLU
++SDL_CFLAGS=`sdl-config --cflags`
+ 
+ SOURCES=main.cpp XAMOS.cpp SDL_collide.cpp Console.cpp AMALDebugTest.cpp PrintStream.cpp AMALBank.cpp AMALEnvGen.cpp AMALParser.cpp AMALInterpreter.cpp AMALCompiler.cpp AmalPrograms.cpp Timer.cpp AMOS_Sprite.cpp MequaScript.cpp AMOS_System.cpp GameEngineWrapper.cpp Mytype.cpp Mytypearray.cpp TheTokens.cpp Parser.cpp Dumper.cpp Interpreter.cpp CommandWrapper.cpp ActiveObject.cpp
+ OBJECTS=$(SOURCES:.cpp=.o)
+@@ -13,7 +14,11 @@ $(EXECUTABLE): $(OBJECTS)
+ 	$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) $< -o $@
++	$(CC) $(CFLAGS) ${SDL_CFLAGS} $< -o $@
++
++install:
++	install -d $(PREFIX)/bin
++	install -m 755 ../XAMOS $(PREFIX)/bin
+ 
+ clean:
+ 	rm -rf $(EXECUTABLE) *.o
+-- 
+2.21.0
 
diff --git a/dev-lang/xamos/xamos-0.29.recipe b/dev-lang/xamos/xamos-0.29.recipe
index d7bcba299..a99463373 100644
--- a/dev-lang/xamos/xamos-0.29.recipe
+++ b/dev-lang/xamos/xamos-0.29.recipe
@@ -1,14 +1,12 @@
 SUMMARY="Cross-platform AMOS BASIC reimplementation"
-DESCRIPTION="
-This project is a complete re-write of jAMOS in C++ using SDL libraries and
-(optional) Boost headers.
+DESCRIPTION="This project is a complete re-write of jAMOS in C++ using SDL \
+libraries and (optional) Boost headers.
 
-This initial release is run-only and does not feature an editor at this stage.
-However, it is compatible with almost all programs created with the latest
-jAMOS editor. All jAMOS examples (without AMAL) are running in XAMOS, often
-with a serious speed boost over the Java original, particularly on low-end
-platforms.
-"
+This initial release is run-only and does not feature an editor at this \
+stage. However, it is compatible with almost all programs created with the \
+latest jAMOS editor. All jAMOS examples (without AMAL) are running in XAMOS, \
+often with a serious speed boost over the Java original, particularly on \
+low-end platforms."
 HOMEPAGE="https://sourceforge.net/projects/xamos"
 COPYRIGHT="2012 Mequa Innovations"
 LICENSE="BSD (2-clause)"
@@ -22,35 +20,57 @@ ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
 	xamos = $portVersion
+	cmd:XAMOS
+	"
+
+REQUIRES="
+	haiku
+	lib:libfreetype
+	lib:libGL
+	lib:libGLU
+	lib:libjpeg
+	lib:libogg
+	lib:libpng16
+	lib:libSDL_1.2
+	lib:libSDL_gfx
+	lib:libSDL_image_1.2
+	lib:libSDL_mixer_1.2
+	lib:libSDL_ttf_2.0
+	lib:libvorbis
+	lib:libvorbisfile
+	lib:libz
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libfreetype
-	devel:libglu
+	devel:libGL
+	devel:libGLU
 	devel:libjpeg
 	devel:libogg
 	devel:libpng
-	devel:libsdl
+	devel:libSDL
+	devel:libSDL_gfx
+	devel:libSDL_image
+	devel:libSDL_mixer
+	devel:libSDL_ttf
+	devel:libvorbis
 	devel:libvorbisfile
 	devel:libz
-	devel:sdl_gfx
-	devel:sdl_image
-	devel:sdl_mixer
-	devel:sdl_ttf
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:g++
 	cmd:make
 	"
 
 BUILD()
 {
 	cd src
-	make -f Makefile_aros
+	make -f Makefile_haiku
 }
 
 INSTALL()
 {
-	false
+	cd src
+	make -f Makefile_haiku install PREFIX=$prefix
 }