diff --git a/pixmap/Makefile.am b/pixmap/Makefile.am
index 457b8e2..3a57119 100644
--- a/pixmap/Makefile.am
+++ b/pixmap/Makefile.am
@@ -17,6 +17,7 @@ pixmaps_DATA = \
 	boycottadvance-sdl.png \
 	bsnes.png \
 	coleco-colecovision.png \
+	commodore-amiga.png \
 	desmume.png \
 	emerson-arcadia2001.png \
 	entex-adventurevision.png \
@@ -24,6 +25,7 @@ pixmaps_DATA = \
 	fbzx.png \
 	fceux.png \
 	fuse.png \
+	fs-uae.png \
 	gambatte.png \
 	gce-vectrex.png \
 	generator.png \
@@ -69,6 +71,7 @@ pixmaps_DATA = \
 	snk-neogeopocketcolor.png \
 	spectemu.png \
 	stella.png \
+	uae.png \
 	virtualjaguar.png \
 	visualboyadvance.png \
 	xe.png \
diff --git a/pixmap/commodore-amiga.png b/pixmap/commodore-amiga.png
new file mode 100644
index 0000000..689b169
Binary files /dev/null and b/pixmap/commodore-amiga.png differ
diff --git a/pixmap/fs-uae.png b/pixmap/fs-uae.png
new file mode 100644
index 0000000..3cb8f91
Binary files /dev/null and b/pixmap/fs-uae.png differ
diff --git a/pixmap/uae.png b/pixmap/uae.png
new file mode 100644
index 0000000..bcb2fa7
Binary files /dev/null and b/pixmap/uae.png differ
diff --git a/src/core/default_systems.cpp b/src/core/default_systems.cpp
index d6c074a..0222d18 100644
--- a/src/core/default_systems.cpp
+++ b/src/core/default_systems.cpp
@@ -379,6 +379,37 @@ void CSystemManager::generateDefaultSystems(void){
 	l_system->addEmulator(l_emulator);
 	addSystem(*l_system);
 
+	/*
+	 *  Commodore - Amiga
+	 */
+	l_system = new CSystem();
+	l_system->setName(_("Commodore Amiga"));
+	l_system->setDescription(_("Amiga Corporation' intented fusion of a computer and video game console released in 1985 as Amiga Commodore"));
+	l_system->setIconFile(GELIDE_PIXMAPS"commodore-amiga.png");
+	// Emulador UAE original
+	l_emulator.setId(0);
+	l_emulator.setName(_("UAE"));
+	l_emulator.setDescription(_("Unix Amiga Emulator, firts emulator for Commodore Amiga started as Unnusable Amiga Emulator at 1995 today abandonware"));
+	l_emulator.setVersion("0.8.29");
+	l_emulator.setAuthor(_("Bernd Schmidt"));
+	l_emulator.setHomepage("");
+	l_emulator.setPath("/usr/bin/uae"); // here due in that times there's no inclusion of emulators as games (i really thing emulator are not game)
+	l_emulator.setParams(" -s gfx_fullscreen_amiga=yes floppy1=\"$gf\" "); // let floppy default and load the software as additional floppy 1
+	l_emulator.setIconFile(GELIDE_PIXMAPS"uae.png");
+	l_system->addEmulator(l_emulator);
+	// Emulador FS-UAE
+	l_emulator.setId(0);
+	l_emulator.setName(_("Fs-UAE"));
+	l_emulator.setDescription(_("Best unix Amiga emulator its the Frode-Solheim-UAE based on the experimental code from original UAE developers"));
+	l_emulator.setVersion("2.5.37");
+	l_emulator.setAuthor(_("Frode Solheim"));
+	l_emulator.setHomepage("http://fs-uae.net");
+	l_emulator.setPath("/usr/bin/fs-uae");
+	l_emulator.setParams(" --fullscreen=1 --floppy_drive_1=\"$gf\" --floppies_dir=\"$bp\"");
+	l_emulator.setIconFile(GELIDE_PIXMAPS"fs-uae.png");
+	l_system->addEmulator(l_emulator);
+	addSystem(*l_system);													
+
 	/*
 	 *  Bandai - WonderSwan Color
 	 */