diff --git a/napalm_iosxr/iosxr.py b/napalm_iosxr/iosxr.py
index b879641..6005bd2 100644
--- a/napalm_iosxr/iosxr.py
+++ b/napalm_iosxr/iosxr.py
@@ -1574,7 +1574,8 @@ def traceroute(self,
                    destination,
                    source=C.TRACEROUTE_SOURCE,
                    ttl=C.TRACEROUTE_TTL,
-                   timeout=C.TRACEROUTE_TIMEOUT):
+                   timeout=C.TRACEROUTE_TIMEOUT,
+                   vrf=C.TRACEROUTE_VRF):
 
         traceroute_result = {}
 
@@ -1587,20 +1588,22 @@ def traceroute(self,
         source_tag = ''
         ttl_tag = ''
         timeout_tag = ''
+        vrf_tag = ''
         if source:
             source_tag = '<Source>{source}</Source>'.format(source=source)
         if ttl:
             ttl_tag = '<MaxTTL>{maxttl}</MaxTTL>'.format(maxttl=ttl)
         if timeout:
             timeout_tag = '<Timeout>{timeout}</Timeout>'.format(timeout=timeout)
-        else:
-            timeout = 5  # seconds
+        if vrf:
+            vrf_tag = '<VRFName>{vrf}</VRFName>'.format(vrf=vrf)
 
         traceroute_rpc_command = '<Set><Action><TraceRoute><IPV{version}><Destination>{destination}\
-        </Destination>{source_tag}{ttl_tag}{timeout_tag}</IPV{version}></TraceRoute></Action>\
+        </Destination>{vrf_tag}{source_tag}{ttl_tag}{timeout_tag}</IPV{version}></TraceRoute></Action>\
         </Set>'.format(
             version=ipv,
             destination=destination,
+            vrf_tag=vrf_tag,
             source_tag=source_tag,
             ttl_tag=ttl_tag,
             timeout_tag=timeout_tag
diff --git a/setup.py b/setup.py
index 514dbe0..1e53780 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name="napalm-iosxr",
-    version="0.4.7",
+    version="0.4.8",
     packages=find_packages(),
     author="David Barroso, Mircea Ulinic",
     author_email="dbarrosop@dravetech.com, mircea@cloudflare.com",