diff --git a/src/game/ending.c b/src/game/ending.c
index b7cb20d..0c81de3 100644
--- a/src/game/ending.c
+++ b/src/game/ending.c
@@ -20,6 +20,92 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "ending.h"
 
+static void logic(void);
+static void draw(void);
+static void loadEndingText(void);
+static char endingText[NUM_ENDING_LINES][MAX_DESCRIPTION_LENGTH];
+
+static Atlas *background[2];
+static Texture *atlasTexture;
+static int endingTextIndex;
+static int endingImageIndex;
+static int endingTimer;
+
 void initEnding(void)
 {
+	background[0] = getImageFromAtlas("gfx/ending/ending01.jpg");
+	background[1] = getImageFromAtlas("gfx/ending/ending02.jpg");
+	
+	atlasTexture = getTexture("gfx/atlas/atlas.png");
+	
+	loadEndingText();
+	
+	endingTextIndex = 0;
+	endingImageIndex = 0;
+	endingTimer = strlen(endingText[endingTextIndex]) * 4;
+	
+	app.delegate.logic = &logic;
+	app.delegate.draw = &draw;
+}
+
+static void logic(void)
+{
+	if (--endingTimer <= -FPS / 2)
+	{
+		if (++endingTextIndex == 3)
+		{
+			endingImageIndex++;
+			startSectionTransition();
+			endSectionTransition();
+		}
+		
+		if (endingTextIndex < NUM_ENDING_LINES)
+		{
+			endingTimer = strlen(endingText[endingTextIndex]) * 4;
+		}
+		else
+		{
+			exit(1);
+		}
+	}
+}
+
+static void draw(void)
+{
+	float h;
+	int th;
+	
+	h = (SCREEN_WIDTH / 800.0) * background[endingImageIndex]->rect.h;
+	
+	blitRectScaled(atlasTexture->texture, 0, SCREEN_HEIGHT - h, SCREEN_WIDTH, h, &background[endingImageIndex]->rect, 0);
+	
+	if (endingTimer > 0)
+	{
+		limitTextWidth(SCREEN_WIDTH / 2);
+		th = getWrappedTextHeight(endingText[endingTextIndex], 24) + 15;
+		drawRect(0, SCREEN_HEIGHT - th - 10, SCREEN_WIDTH, th + 10, 0, 0, 0, 128);
+		drawText(SCREEN_WIDTH / 2, SCREEN_HEIGHT - th, 24, TA_CENTER, colors.white, endingText[endingTextIndex]);
+		limitTextWidth(0);
+	}
+}
+
+static void loadEndingText(void)
+{
+	int i;
+	char *text, *line;
+	
+	i = 0;
+	
+	memset(endingText, 0, sizeof(NUM_ENDING_LINES * MAX_DESCRIPTION_LENGTH));
+	
+	text = readFile("data/misc/ending.txt");
+	
+	line = strtok(text, "\n");
+	
+	while (line)
+	{
+		strncpy(endingText[i++], line, MAX_DESCRIPTION_LENGTH);
+		
+		line = strtok(NULL, "\n");
+	}
 }
diff --git a/src/game/ending.h b/src/game/ending.h
index 8ad0dc9..4a138d5 100644
--- a/src/game/ending.h
+++ b/src/game/ending.h
@@ -18,4 +18,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#define NUM_ENDING_LINES	6
+
 #include "../common.h"
+
+extern Atlas *getImageFromAtlas(char *filename);
+extern Texture *getTexture(const char *filename);
+extern char *readFile(const char *filename);
+extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center);
+extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
+extern void limitTextWidth(int width);
+extern void endSectionTransition(void);
+extern void startSectionTransition(void);
+extern int getWrappedTextHeight(const char *text, int size);
+extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
+
+extern App app;
+extern Colors colors;
diff --git a/src/main.c b/src/main.c
index 3bf7807..ff6fa65 100644
--- a/src/main.c
+++ b/src/main.c
@@ -170,6 +170,12 @@ static void handleCommandLine(int argc, char *argv[])
 		{
 			worldId = argv[++i];
 		}
+		
+		if (strcmp(argv[i], "-ending") == 0)
+		{
+			initEnding();
+			return;
+		}
 	}
 
 	initWorldTest(worldId);
diff --git a/src/main.h b/src/main.h
index f8c717a..4873cba 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,6 +32,7 @@ extern void initGameSystem(void);
 extern void initLookups(void);
 extern void initSDL(void);
 extern void initWorldTest(char *worldId);
+extern void initEnding(void);
 extern void prepareScene(void);
 extern void presentScene(void);
 extern void saveScreenshot(char *name);