diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RClientCodegen.java
index 5ccb632629de..d34528eaf100 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RClientCodegen.java
@@ -146,6 +146,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("response.mustache", "/R", "Response.r"));
         supportingFiles.add(new SupportingFile("element.mustache", "/R", "Element.r"));
         supportingFiles.add(new SupportingFile("api_client.mustache", "/R", "ApiClient.r"));
+        supportingFiles.add(new SupportingFile("NAMESPACE.mustache", "", "NAMESPACE"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/r/NAMESPACE.mustache b/modules/swagger-codegen/src/main/resources/r/NAMESPACE.mustache
new file mode 100644
index 000000000000..0fe95acd6dfc
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/r/NAMESPACE.mustache
@@ -0,0 +1,8 @@
+# Generated by swagger-codegen: https://github.com/swagger-api/swagger-codegen
+# Do not edit by hand
+
+{{#models}}
+{{#model}}
+export({{{classname}}})
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/r/namespace.mustache b/modules/swagger-codegen/src/main/resources/r/namespace.mustache
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/samples/client/petstore/r_test/NAMESPACE b/samples/client/petstore/r_test/NAMESPACE
new file mode 100644
index 000000000000..8af3d6d65020
--- /dev/null
+++ b/samples/client/petstore/r_test/NAMESPACE
@@ -0,0 +1,9 @@
+# Generated by swagger-codegen: https://github.com/swagger-api/swagger-codegen
+# Do not edit by hand
+
+export(ApiResponse)
+export(Category)
+export(Order)
+export(Pet)
+export(Tag)
+export(User)