diff --git a/configure.ac b/configure.ac
index 1467c90..77f8785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product 
 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
 AC_SUBST(PRODUCT_NAME,$app_cv_product)
 
-AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id="br.com.bb.$app_cv_product" ])
+AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id="br.app.$app_cv_product" ])
 
 AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id)
 AC_SUBST(APPLICATION_ID,$app_cv_application_id)
diff --git a/flathub/br.app.pw3270.yml b/flathub/br.app.pw3270.yml
new file mode 100644
index 0000000..ba3fde1
--- /dev/null
+++ b/flathub/br.app.pw3270.yml
@@ -0,0 +1,53 @@
+app-id: br.app.pw3270
+runtime: org.gnome.Platform
+sdk: org.gnome.Sdk
+command: pw3270
+finish-args:
+  - "--share=network"
+  - "--share=ipc"
+  - "--socket=fallback-x11"
+  - "--socket=wayland"
+  - "--own-name=br.app.pw3270"
+cleanup:
+  - "/include"
+  - "/lib/pkgconfig"
+  - "/man"
+  - "/share/doc"
+  - "/share/gtk-doc"
+  - "/share/man"
+  - "/share/pkgconfig"
+  - "*.la"
+  - "*.a"
+modules:
+  - name: lib3270
+    buildsystem: simple
+    build-commands:
+      - NOCONFIGURE=1 ./autogen.sh
+      - ./configure --prefix=/app
+      - make all
+      - make install
+    sources:
+      - type: git
+        url: https://github.com/PerryWerneck/lib3270
+  - name: libv3270
+    buildsystem: simple
+    build-commands:
+      - NOCONFIGURE=1 ./autogen.sh
+      - ./configure --prefix=/app PKG_CONFIG_PATH=/app/lib/pkgconfig CFLAGS=-I/app/include LDFLAGS=-L/app/lib
+      - make all
+      - make install
+    sources:
+      - type: git
+        url: https://github.com/PerryWerneck/libv3270
+  - name: pw3270
+    buildsystem: simple
+    build-commands:
+      - NOCONFIGURE=1 ./autogen.sh
+      - ./configure --prefix=/app PKG_CONFIG_PATH=/app/lib/pkgconfig CFLAGS=-I/app/usr/include LDFLAGS=-L/app/lib
+      - make all
+      - make install
+    sources:
+      - type: git
+        url: https://github.com/PerryWerneck/pw3270
+
+
diff --git a/macos/Info.plist b/macos/Info.plist
index 698aa49..d35990c 100644
--- a/macos/Info.plist
+++ b/macos/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>pw3270.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>br.com.bb.pw3270</string>
+	<string>br.app.pw3270</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
diff --git a/schemas/linux/application.gschema.xml.in b/schemas/linux/application.gschema.xml.in
index a51f8dc..8c07164 100644
--- a/schemas/linux/application.gschema.xml.in
+++ b/schemas/linux/application.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
+  <schema path="/br/app/@PRODUCT_NAME@/" id="br.app.@PRODUCT_NAME@">
 
     <key name="ui-style" type="u">
       <default>2</default>
diff --git a/schemas/linux/window.gschema.xml.in b/schemas/linux/window.gschema.xml.in
index 1e63335..3bd7c91 100644
--- a/schemas/linux/window.gschema.xml.in
+++ b/schemas/linux/window.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
+  <schema path="/br/app/@PRODUCT_NAME@/window/" id="br.app.@PRODUCT_NAME@.window">
 
     <key name="width" type="i">
       <default>-1</default>
diff --git a/schemas/macos/application.gschema.xml.in b/schemas/macos/application.gschema.xml.in
index a51f8dc..8c07164 100644
--- a/schemas/macos/application.gschema.xml.in
+++ b/schemas/macos/application.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
+  <schema path="/br/app/@PRODUCT_NAME@/" id="br.app.@PRODUCT_NAME@">
 
     <key name="ui-style" type="u">
       <default>2</default>
diff --git a/schemas/macos/window.gschema.xml.in b/schemas/macos/window.gschema.xml.in
index 9ad6f76..62d1a2e 100644
--- a/schemas/macos/window.gschema.xml.in
+++ b/schemas/macos/window.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
+  <schema path="/br/app/@PRODUCT_NAME@/window/" id="br.app.@PRODUCT_NAME@.window">
 
     <key name="width" type="i">
       <default>-1</default>
diff --git a/schemas/windows/application.gschema.xml.in b/schemas/windows/application.gschema.xml.in
index 1b69d0e..ea7cedd 100644
--- a/schemas/windows/application.gschema.xml.in
+++ b/schemas/windows/application.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
+  <schema path="/br/app/@PRODUCT_NAME@/" id="br.app.@PRODUCT_NAME@">
 
     <key name="ui-style" type="u">
       <default>0</default>
diff --git a/schemas/windows/window.gschema.xml.in b/schemas/windows/window.gschema.xml.in
index dae0bda..eabb596 100644
--- a/schemas/windows/window.gschema.xml.in
+++ b/schemas/windows/window.gschema.xml.in
@@ -30,7 +30,7 @@
 
 <schemalist>
 
-  <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
+  <schema path="/br/app/@PRODUCT_NAME@/window/" id="br.app.@PRODUCT_NAME@.window">
 
     <key name="width" type="i">
       <default>-1</default>
diff --git a/src/main/windows/app-manifest.xml.in b/src/main/windows/app-manifest.xml.in
index f119531..e98b5a9 100644
--- a/src/main/windows/app-manifest.xml.in
+++ b/src/main/windows/app-manifest.xml.in
@@ -3,7 +3,7 @@
     <assemblyIdentity
         version="@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
         processorArchitecture="*"
-        name="br.com.bb.@PRODUCT_NAME@"
+        name="br.app.@PRODUCT_NAME@"
         type="win32"
     />
     <description>@PACKAGE_DESCRIPTION@</description>
diff --git a/src/objects/actions/testprogram/testprogram.c b/src/objects/actions/testprogram/testprogram.c
index 623627b..5d2f1f1 100644
--- a/src/objects/actions/testprogram/testprogram.c
+++ b/src/objects/actions/testprogram/testprogram.c
@@ -117,7 +117,7 @@ int main (int argc, char **argv) {
 	GtkApplication *app;
 	int status;
 
-	app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE);
+	app = gtk_application_new ("br.app.pw3270",G_APPLICATION_FLAGS_NONE);
 
 	g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
 
diff --git a/src/objects/keypad/testprogram/testprogram.c b/src/objects/keypad/testprogram/testprogram.c
index e2adc68..02b3b0f 100644
--- a/src/objects/keypad/testprogram/testprogram.c
+++ b/src/objects/keypad/testprogram/testprogram.c
@@ -74,7 +74,7 @@ int main (int argc, char **argv) {
 	GtkApplication *app;
 	int status;
 
-	app = gtk_application_new ("br.com.bb.pw3270.keypad",G_APPLICATION_FLAGS_NONE);
+	app = gtk_application_new ("br.app.pw3270.keypad",G_APPLICATION_FLAGS_NONE);
 
 	g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
 
diff --git a/src/objects/settings/gsettings.c b/src/objects/settings/gsettings.c
index 5ddf46f..a008eb5 100644
--- a/src/objects/settings/gsettings.c
+++ b/src/objects/settings/gsettings.c
@@ -148,9 +148,9 @@
  }
 
  GSettings * pw3270_application_settings_new() {
-	return settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME));
+	return settings_new("br.app." G_STRINGIFY(PRODUCT_NAME));
  }
 
  GSettings * pw3270_application_window_settings_new() {
-	return settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME) ".window");
+	return settings_new("br.app." G_STRINGIFY(PRODUCT_NAME) ".window");
  }
diff --git a/src/objects/toolbar/testprogram/testprogram.c b/src/objects/toolbar/testprogram/testprogram.c
index d8eda9c..8fb7642 100644
--- a/src/objects/toolbar/testprogram/testprogram.c
+++ b/src/objects/toolbar/testprogram/testprogram.c
@@ -94,7 +94,7 @@ int main (int argc, char **argv) {
 	GtkApplication *app;
 	int status;
 
-	app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE);
+	app = gtk_application_new ("br.app.pw3270",G_APPLICATION_FLAGS_NONE);
 
 	g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
 
diff --git a/src/objects/window/testprogram/testprogram.c b/src/objects/window/testprogram/testprogram.c
index 89fe93f..cd75c14 100644
--- a/src/objects/window/testprogram/testprogram.c
+++ b/src/objects/window/testprogram/testprogram.c
@@ -80,7 +80,7 @@ int main (int argc, char **argv) {
 	GtkApplication *app;
 	int status;
 
-	app = pw3270_application_new("br.com.bb.pw3270",G_APPLICATION_HANDLES_OPEN);
+	app = pw3270_application_new("br.app.pw3270",G_APPLICATION_HANDLES_OPEN);
 	status = g_application_run (G_APPLICATION (app), argc, argv);
 	g_object_unref (app);
 
--
libgit2 0.21.2