diff --git a/it.emulab.mamedev.clrmamepro/README.md b/it.emulab.mamedev.clrmamepro/README.md
new file mode 100644
index 0000000..86bf77c
--- /dev/null
+++ b/it.emulab.mamedev.clrmamepro/README.md
@@ -0,0 +1,34 @@
+# clrmamepro
+clrmamepro is a ROM manager and modifier
+
+## Status
+
+| Arch  | Installs | Runs | Notes |
+| ----- | -------- | ---- | ----- |
+| 32bit | Yes      | Yes  |       |
+| 64bit | Yes      | Yes  |       |
+
+## Build & Install
+### Repo
+#### 32bit
+
+    flatpak-builder --arch=i386 --force-clean builds --repo=winepak it.emulab.mamedev.clrmamepro
+    flatpak --user install winepak it.emulab.mamedev.clrmamepro
+    
+#### 64bit
+
+    flatpak-builder --arch=x86_64 --force-clean builds --repo=winepak it.emulab.mamedev.clrmamepro
+    flatpak --user install winepak it.emulab.mamedev.clrmamepro
+
+### Direct
+#### 32bit
+
+    flatpak-builder --user --arch=i386 --force-clean --install builds it.emulab.mamedev.clrmamepro.yaml
+    
+#### 64bit
+
+    flatpak-builder --user --arch=x86_64 --force-clean --install builds it.emulab.mamedev.clrmamepro.yaml
+
+## Run
+
+    flatpak run it.emulab.mamedev.clrmamepro
diff --git a/it.emulab.mamedev.clrmamepro/icons/it.emulab.mamedev.clrmamepro.32x32.png b/it.emulab.mamedev.clrmamepro/icons/it.emulab.mamedev.clrmamepro.32x32.png
new file mode 100644
index 0000000..90e2fdb
Binary files /dev/null and b/it.emulab.mamedev.clrmamepro/icons/it.emulab.mamedev.clrmamepro.32x32.png differ
diff --git a/it.emulab.mamedev.clrmamepro/icons/it.emulab.mamedev.clrmamepro.48x48.png b/it.emulab.mamedev.clrmamepro/icons/it.emulab.mamedev.clrmamepro.48x48.png
new file mode 100644
index 0000000..b38bb9d
Binary files /dev/null and b/it.emulab.mamedev.clrmamepro/icons/it.emulab.mamedev.clrmamepro.48x48.png differ
diff --git a/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.appdata.xml b/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.appdata.xml
new file mode 100644
index 0000000..d62a922
--- /dev/null
+++ b/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.appdata.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>it.emulab.mamedev.clrmamepro.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>LicenseRef-proprietary</project_license>
+    <name>clrmamepro</name>
+    <summary>clrmamepro is a ROM manager and modifier for Windows.</summary>
+    <description>
+        <p>clrmamepro manages and modifies your ROM files so that they can be easily used with any emulator. It includes management and datting tools to help with nearly any ROM-based emulation.</p>
+    </description>
+    
+    <project_group>winepak</project_group>
+    <developer_name>Roman Scherzer</developer_name>
+
+    <url type="homepage">https://mamedev.emulab.it/clrmamepro</url>
+    <url type="help">https://mamedev.emulab.it/clrmamepro/docs/index.htm</url>
+
+    <categories>
+        <category>System</category>
+        <category>Emulator</category>
+    </categories>
+
+    <content_rating type="oars-1.1">
+        <content_attribute id="violence-cartoon">none</content_attribute>
+        <content_attribute id="violence-fantasy">none</content_attribute>
+        <content_attribute id="violence-realistic">none</content_attribute>
+        <content_attribute id="violence-bloodshed">none</content_attribute>
+        <content_attribute id="violence-sexual">none</content_attribute>
+        <content_attribute id="violence-desecration">none</content_attribute>
+        <content_attribute id="violence-slavery">none</content_attribute>
+        <content_attribute id="violence-worship">none</content_attribute>
+        <content_attribute id="drugs-alcohol">none</content_attribute>
+        <content_attribute id="drugs-narcotics">none</content_attribute>
+        <content_attribute id="drugs-tobacco">none</content_attribute>
+        <content_attribute id="sex-nudity">none</content_attribute>
+        <content_attribute id="sex-themes">none</content_attribute>
+        <content_attribute id="sex-homosexuality">none</content_attribute>
+        <content_attribute id="sex-prostitution">none</content_attribute>
+        <content_attribute id="sex-adultery">none</content_attribute>
+        <content_attribute id="sex-appearance">none</content_attribute>
+        <content_attribute id="language-profanity">none</content_attribute>
+        <content_attribute id="language-humor">none</content_attribute>
+        <content_attribute id="language-discrimination">none</content_attribute>
+        <content_attribute id="social-chat">none</content_attribute>
+        <content_attribute id="social-info">none</content_attribute>
+        <content_attribute id="social-audio">none</content_attribute>
+        <content_attribute id="social-location">none</content_attribute>
+        <content_attribute id="social-contacts">none</content_attribute>
+        <content_attribute id="money-purchasing">none</content_attribute>
+        <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+
+    <releases>
+        <release date="2018-06-21" version="4.034">
+        </release>
+    </releases>
+</component>
diff --git a/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.desktop b/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.desktop
new file mode 100644
index 0000000..923ff2b
--- /dev/null
+++ b/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=clrmamepro
+Comment=ROM manager and manipulator
+Exec=clrmamepro %U
+StartupNotify=true
+Terminal=false
+Type=Application
+MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;
+Categories=System;Emulator;
+Keywords=Emulator;Editor;Manager;
+Icon=it.emulab.mamedev.clrmamepro
+Name[en_US]=it.emulab.mamedev.clrmamepro.desktop
diff --git a/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.yaml b/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.yaml
new file mode 100644
index 0000000..78a5315
--- /dev/null
+++ b/it.emulab.mamedev.clrmamepro/it.emulab.mamedev.clrmamepro.yaml
@@ -0,0 +1,107 @@
+app-id: it.emulab.mamedev.clrmamepro
+
+runtime: org.winepak.Platform
+runtime-version: 3.0
+sdk: org.winepak.Sdk
+
+command: clrmamepro
+
+add-extensions:
+  org.winepak.Platform.Compat32:
+    directory: lib/32bit
+    version: 3.0
+    add-ld-path: lib
+    no-autodownload: false
+
+tags:
+  - proprietary
+
+finish-args:
+  - --socket=x11
+  - --device=dri
+  - --allow=multiarch
+  - --filesystem=host
+
+modules:
+  - name: setup-compat32
+    buildsystem: simple
+    build-commands:
+      - mkdir -p /app/lib/32bit
+      - ln -s /app/lib/32bit/lib/ld-linux.so.2 /app/lib/ld-linux.so.2
+
+  - name: setup-wine-compat32
+    buildsystem: simple
+    build-commands:
+      - mkdir -p /app/lib/wine-32bit
+
+  - name: clrmamepro
+    buildsystem: simple
+    build-commands:
+      - install -d /app/bin
+      - install apply_extra /app/bin
+      - install clrmamepro /app/bin
+      - install -Dm644 it.emulab.mamedev.clrmamepro.appdata.xml /app/share/appdata/it.emulab.mamedev.clrmamepro.appdata.xml
+      - install -Dm644 it.emulab.mamedev.clrmamepro.desktop /app/share/applications/it.emulab.mamedev.clrmamepro.desktop
+      - install -Dm644 it.emulab.mamedev.clrmamepro.48x48.png /app/share/icons/hicolor/48x48/apps/it.emulab.mamedev.clrmamepro.png
+      - install -Dm644 it.emulab.mamedev.clrmamepro.32x32.png /app/share/icons/hicolor/32x32/apps/it.emulab.mamedev.clrmamepro.png
+    sources:
+    - type: extra-data
+      only-arches:
+        - x86_64
+      url: https://mamedev.emulab.it/clrmamepro/binaries/cmp4034_64.zip
+      sha256: ef31b6228151ed4b27d763ed8d1ddeb4f45dda42d5786f5822ec11e2f391cab5
+      size: 6195697
+      filename: clrmamepro.zip
+    - type: extra-data
+      only-arches:
+        - i386
+      url: https://mamedev.emulab.it/clrmamepro/binaries/cmp4034_32.zip
+      sha256: 0f83ccbdefae39d7526a389f9b52193520d915012cf398b3a908ef117ce2488d
+      size: 5522753
+      filename: clrmamepro.zip
+    - type: script
+      dest-filename: apply_extra
+      commands:
+        - mkdir -p /app/extra/clrmamepro
+        - unzip -qq -d /app/extra/clrmamepro clrmamepro.zip
+        - rm clrmamepro.zip
+    - type: script
+      only-arches:
+        - x86_64
+      dest-filename: clrmamepro
+      commands:
+        - export WINEARCH=win64
+        -
+        # clrmamepro writes it's config files in the current directory
+        # Running files in /app/extra wont work, instead make a copy to
+        # /var/data a.k.a $XDG_DATA_HOME
+        - mkdir -p /var/data/clrmamepro
+        - cp -a /app/extra/clrmamepro /var/data
+        -
+        - wineboot
+        -
+        - wine64 /var/data/clrmamepro/cmpro64.exe "$@"
+    - type: script
+      only-arches:
+        - i386
+      dest-filename: clrmamepro
+      commands:
+        - export WINEARCH=win32
+        -
+        # clrmamepro writes it's config files in the current directory
+        # Running files in /app/extra wont work, instead make a copy to
+        # /var/data a.k.a $XDG_DATA_HOME
+        - mkdir -p /var/data/clrmamepro
+        - cp -a /app/extra/clrmamepro /var/data
+        -
+        - wineboot
+        -
+        - wine /var/data/clrmamepro/cmpro.exe "$@"
+    - type: file
+      path: it.emulab.mamedev.clrmamepro.appdata.xml
+    - type: file
+      path: it.emulab.mamedev.clrmamepro.desktop
+    - type: file
+      path: icons/it.emulab.mamedev.clrmamepro.48x48.png
+    - type: file
+      path: icons/it.emulab.mamedev.clrmamepro.32x32.png